Merge branch 'develop' into nice_dev

src/modules/02_organizationalNew/components/DialogFormAgency.vue

@@ -109,9 +109,9 @@ watch(
                   dense
                   outlined
                   for="#ocName"
-                  label="สรุปผลการพิจารณา"
+                  label="ชื่อหน่วยงาน"
                   hide-bottom-space
-                  :rules="[(val) => !!val || `${'กรุณากรอกสรุปผลการพิจารณา'}`]"
+                  :rules="[(val) => !!val || `${'กรุณากรอกชื่อหน่วยงาน'}`]"
                 />
               </div>
               <div class="col-2">

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

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

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

@@ -134,6 +134,7 @@ const formData = reactive<FormData>({
   persons: [],
   investigationExtendHistory: [],
   isDisciplinary: false,
+  isAncestorDNA: false,
 });
 
 const rows = ref([]);
@@ -272,6 +273,7 @@ watch(props.data, async () => {
         organization: person.organization,
         isSend: person.isSend,
         isDisciplinary: person.isDisciplinary,
+        isAncestorDNA: person.isAncestorDNA,
       }));
       mainStore.rowsCheck = mainStore.rowsAdd.filter(
         (item: any) => item.isDisciplinary === false && item.isSend === "NEW"
@@ -783,7 +785,7 @@ onMounted(async () => {
                                 col.label
                               }}</span>
                             </q-th>
-                            <!-- <q-th auto-width></q-th> -->
+                            <q-th auto-width></q-th>
                           </q-tr>
                         </template>
                         <template v-slot:body="props">
@@ -821,9 +823,9 @@ onMounted(async () => {
                                 {{ col.value }}
                               </div>
                             </q-td>
-                            <!-- <q-td auto-width>
+                            <q-td auto-width>
                               <q-btn
-                                v-if="!isReadonly"
+                                v-if="!isReadonly && props.row.isAncestorDNA === false"
                                 size="12px"
                                 flat
                                 round
@@ -834,7 +836,7 @@ onMounted(async () => {
                                 @click="deletePerson(props.row.personId)"
                                 ><q-tooltip>ลบผู้ถูกร้องเรียน</q-tooltip></q-btn
                               >
-                            </q-td> -->
+                            </q-td>
                           </q-tr>
                         </template>
                       </d-table>

src/modules/11_discipline/components/3_InvestigateDisciplinary/EditPage.vue

@@ -118,6 +118,7 @@ const dataInvestigatefacts = reactive<FormInvestigateFact>({
   persons: [],
   investigationExtendHistory: [],
   isDisciplinary: false,
+  isAncestorDNA:false
 });
 
 /** function fetchData สอบสวนความผิดทางวินัย*/

src/modules/11_discipline/components/3_InvestigateDisciplinary/Form.vue

@@ -365,6 +365,7 @@ async function fetchDatadetail() {
         isSuspend: person.isSuspend,
         status: person.status,
         statusDiscard: person.statusDiscard,
+        isAncestorDNA: person.isAncestorDNA,
       }));
       mainStore.rowsCheck = mainStore.rowsAdd.filter(
         (item: any) => item.isSuspend === "NEW" && item.isSend === "NEW"
@@ -668,6 +669,12 @@ watch(
   }
 );
 
+function deletePerson(id: string) {
+  changeFormData();
+  const dataRow = mainStore.rowsAdd;
+  const updatedRows = dataRow.filter((item: any) => item.personId !== id);
+  mainStore.rowsAdd = updatedRows;
+}
 
 /** Hook */
 onMounted(async () => {
@@ -824,7 +831,7 @@ onMounted(async () => {
                                 col.label
                               }}</span>
                             </q-th>
-                            <!-- <q-th auto-width></q-th> -->
+                            <q-th auto-width></q-th>
                           </q-tr>
                         </template>
                         <template v-slot:body="props">
@@ -862,9 +869,9 @@ onMounted(async () => {
                                 {{ col.value }}
                               </div>
                             </q-td>
-                            <!-- <q-td auto-width>
+                            <q-td auto-width>
                               <q-btn
-                                v-if="!isReadonly"
+                                v-if="!isReadonly && props.row.isAncestorDNA === false"
                                 size="12px"
                                 flat
                                 round
@@ -875,7 +882,7 @@ onMounted(async () => {
                                 @click="deletePerson(props.row.personId)"
                                 ><q-tooltip>ลบผู้ถูกร้องเรียน</q-tooltip></q-btn
                               >
-                            </q-td> -->
+                            </q-td>
                           </q-tr>
                         </template>
                       </d-table>

src/modules/11_discipline/interface/request/investigateFact.ts

@@ -27,6 +27,7 @@ interface FormData {
   persons: object | null;
   investigationExtendHistory: ExtendHistoryObject[];
   isDisciplinary:boolean
+  isAncestorDNA:boolean
 }
 
 interface ExtendHistoryObject {

src/modules/11_discipline/store/main.ts

@@ -306,7 +306,7 @@ export const useDisciplineMainStore = defineStore("disciplineMainStore", () => {
         salary: item.salary === null ? '-':item.salary,
         personId: item.personId,
         posNo: item.posNo === null ? '-':item.posNo,
-        organization: item.organization
+        organization: item.organization,
       }
     ))
     rowsAdd.value = dataList;