Merge branch 'develop' of github.com:Frappet/BMA-EHR-USER into develop

src/modules/10_registry/components/DialogAddRequestEdit.vue

@@ -170,8 +170,10 @@ function fetchProfile() {
 }
 
 /** popup รายละเอียดของ ขออัปเดตข้อมูลจากกรมการปกครอง */
-function onInfo() {
-  modalInfo.value = true;
+function onInfo(val: string) {
+  if (val == "ขออัปเดตข้อมูลจากกรมการปกครอง") {
+    modalInfo.value = true;
+  }
 }
 
 watch(
@@ -205,22 +207,11 @@ watch(
                 lazy-rules
                 hide-bottom-space
                 use-input
+                @update:model-value="onInfo(formData.topic)"
                 @filter="(inputValue:string,
                 doneFn:Function) => filterOption(inputValue, doneFn
                 ) "
               >
-                <template v-slot:option="scope">
-                  <q-item v-bind="scope.itemProps">
-                    <q-item-section v-if="scope.index == 0">
-                      <q-item-label @click="onInfo">{{
-                        scope.opt
-                      }}</q-item-label>
-                    </q-item-section>
-                    <q-item-section v-else>
-                      <q-item-label>{{ scope.opt }}</q-item-label>
-                    </q-item-section>
-                  </q-item>
-                </template>
                 <template v-slot:no-option>
                   <q-item>
                     <q-item-section class="text-grey">
@@ -323,7 +314,11 @@ watch(
       <q-separator />
 
       <q-card-actions align="right">
-        <q-btn label="ตกลง" color="secondary" type="submit"
+        <q-btn
+          label="ตกลง"
+          color="secondary"
+          type="submit"
+          @click="() => (modalInfo = false)"
           ><q-tooltip>ตกลง</q-tooltip></q-btn
         >
       </q-card-actions>

src/modules/10_registry/views/requestEditMain.vue

@@ -83,9 +83,9 @@ const columns = ref<QTableProps["columns"]>([
   },
   {
     name: "document",
-    align: "left",
+    align: "center",
     label: "หลักฐานอ้างอิง",
-    sortable: true,
+    sortable: false,
     field: "document",
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",