แก้ฟิล

src/modules/11_discipline/components/8_AppealComplain/Form.vue

@@ -53,6 +53,7 @@ const modalEdit = ref<boolean>(false);
 
 const historyStatusOb = reactive<HistoryStatusType[]>([{
   status: "",
+  createdFullName: "",
   createdAt: new Date(),
 }]);
 
@@ -85,7 +86,7 @@ const objectAppeal: MyObjectAppealRef = {
 };
 
 /** หัวข้อที่เเสดงในตารางผู้ถูกร้องเรียน */
-const visibleColumns = ref<string[]>(["no", "citizenId", "fullname"]);
+const visibleColumns = ref<string[]>(["no", "citizenId", "fullname","oc",'position']);
 /** หัวตารางผู้ถูกร้องเรียน */
 const columns = ref<QTableProps["columns"]>([
 
@@ -116,6 +117,24 @@ const columns = ref<QTableProps["columns"]>([
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
   },
+  {
+    name: "oc",
+    align: "left",
+    label: "สังกัด",
+    sortable: true,
+    field: "oc",
+    headerStyle: "font-size: 14px",
+    style: "font-size: 14px",
+  },
+  {
+    name: "position",
+    align: "left",
+    label: "ตำแหน่ง",
+    sortable: true,
+    field: "position",
+    headerStyle: "font-size: 14px",
+    style: "font-size: 14px",
+  },
 ]);
 
 /*** ฟังก์ชั่นสำหรับ validate ฟอร์ม */
@@ -161,14 +180,17 @@ function handleSave(returnData: any) {
     profileId: item.personId,
     fullname: item.name,
     citizenId: item.idcard,
+    oc: item.organization,
+    position: item.position,
   }));
 }
 
 function inputEdit(val: boolean) {
   return {
-    "full-width cursor-pointer ": val,
+    "full-width cursor-pointer inputgreen ": val,
     "full-width cursor-pointer inputgreen": !val,
   };
+
 }
 
 function uploadFile() {
@@ -245,6 +267,8 @@ watch(props.data, async () => {
         profileId: props.data.profileId,
         fullname: props.data.fullname,
         citizenId: props.data.citizenId,
+        oc: props.data.oc,
+        position: props.data.position,
       },
     ]);
   }
@@ -274,6 +298,8 @@ function onSubmit() {
         caseType: formData.caseType,
         caseNumber: formData.caseNumber,
         file: formData.file,
+        oc: dataRow[0].oc,
+        position: dataRow[0].position,
         status: formData.status,
       };
       props.onSubmit(data);
@@ -299,7 +325,6 @@ onMounted(() => {
                   <q-select
                     ref="typeRef"
                     :class="inputEdit(isReadonly)"
-                    :readonly="isReadonly"
                     v-model="formData.type"
                     label="ประเภท"
                     dense
@@ -318,6 +343,7 @@ onMounted(() => {
                   <q-select
                     ref="statusRef"
                     v-model="formData.status"
+                    :class="inputEdit(isReadonly)"
                     label="สถานะ"
                     dense
                     bg-color="white"
@@ -357,7 +383,7 @@ onMounted(() => {
                   >
                     ผู้ยื่นอุทธณ์/ร้องทุกข์
                     <q-btn
-                      v-if="!isReadonly"
+                    v-if="!isReadonly"
                       size="12px"
                       flat
                       round
@@ -409,10 +435,10 @@ onMounted(() => {
                               {{ props.rowIndex + 1 }}
                             </div>
                             <div
-                              v-else-if="col.name === 'organization'"
+                              v-else-if="col.name === 'oc'"
                               class="table_ellipsis"
                             >
-                              {{ props.row.organization }}
+                              {{ props.row.oc }}
                             </div>
                             <div v-else>
                               {{ col.value }}
@@ -426,7 +452,7 @@ onMounted(() => {
               </div>
 
               <div class="row col-12">
-                <div class="col-xs-3 col-sm-3" id="title">
+                <div class="col-12" id="title">
                   <q-input
                     ref="titleRef"
                     dense
@@ -466,7 +492,6 @@ onMounted(() => {
                     class="col-2"
                     :locale="'th'"
                     autoApply
-                    :readonly="isReadonly"
                     year-picker
                     :enableTimePicker="false"
                   >
@@ -478,7 +503,6 @@ onMounted(() => {
                       <q-input
                         dense
                         :class="inputEdit(isReadonly)"
-                        :readonly="isReadonly"
                         lazy-rules
                         outlined
                         :model-value="Number(formData.year) + 543"