updated

src/modules/04_registryPerson/components/Dialog/02_Address.vue

@@ -200,126 +200,5 @@ watch(
         />
       </div>
     </div>
-    <!-- same address ? -->
-    <div class="col-xs-12 q-gutter-sm items-center flex q-my-sm">
-      <label class="text-medium"
-        >ที่อยู่ปัจจุบันตรงกับที่อยู่ตามทะเบียนบ้าน</label
-      >
-      <q-radio
-        dense
-        val="1"
-        label="ใช่"
-        checked-icon="task_alt"
-        class="inputgreen"
-        v-model="presentAddress"
-        unchecked-icon="panorama_fish_eye"
-      />
-      <q-radio
-        dense
-        val="0"
-        label="ไม่"
-        checked-icon="task_alt"
-        class="inputgreen"
-        v-model="presentAddress"
-        unchecked-icon="panorama_fish_eye"
-      />
-    </div>
-    <!-- current address -->
-    <div v-if="presentAddress === '0'">
-      <div class="col-12 q-pb-xs">
-        <q-input
-          dense
-          outlined
-          lazy-rules
-          hide-bottom-space
-          class="inputgreen"
-          v-model="formDataAddress.currentAddress"
-          :label="dataLabel.currentAddress"
-          :rules="[(val:string) => !!val || `${'กรุณากรอก ที่อยู่ปัจจุบัน'}`]"
-        />
-      </div>
-      <div class="row col-12 q-col-gutter-x-xs q-col-gutter-y-xs">
-        <div class="col-xs-6 col-sm-6 col-md-3">
-          <q-select
-            dense
-            outlined
-            use-input
-            lazy-rules
-            emit-value
-            map-options
-            hide-bottom-space
-            option-value="id"
-            option-label="name"
-            input-debounce="0"
-            class="inputgreen"
-            v-model="formDataAddress.currentProvinceId"
-            :options="storeLinkCenter.OpsAddress.provinceOps"
-            :label="dataLabel.currentProvince"
-            :rules="[(val:string) => !!val || `${'กรุณาเลือก จังหวัด'}`]"
-            @update:model-value="(value:string) => selectProvince(value, '2')"
-            @filter="(inputValue:string,
-                      doneFn:Function) => storeLinkCenter.filterSelector(inputValue, doneFn,'provinceOps'
-                      ) "
-          />
-        </div>
-        <div class="col-xs-6 col-sm-6 col-md-3">
-          <q-select
-            dense
-            outlined
-            use-input
-            lazy-rules
-            emit-value
-            map-options
-            hide-bottom-space
-            option-value="id"
-            option-label="name"
-            input-debounce="0"
-            class="inputgreen"
-            v-model="formDataAddress.currentDistrictId"
-            :options="storeLinkCenter.OpsAddress.districtCOps"
-            :label="dataLabel.currentDistrict"
-            :rules="[(val:string) => !!val || `${'กรุณาเลือก เขต / อำเภอ'}`]"
-            @update:model-value="(value:string) => selectDistrict(value, '2')"
-            @filter="(inputValue:string,
-                      doneFn:Function) => storeLinkCenter.filterSelector(inputValue, doneFn,'districtCOps'
-                      ) "
-          />
-        </div>
-        <div class="col-xs-6 col-sm-6 col-md-3">
-          <q-select
-            dense
-            outlined
-            use-input
-            lazy-rules
-            emit-value
-            map-options
-            hide-bottom-space
-            option-value="id"
-            option-label="name"
-            input-debounce="0"
-            class="inputgreen"
-            v-model="formDataAddress.currentSubDistrictId"
-            :options="storeLinkCenter.OpsAddress.subdistrictCOps"
-            :label="dataLabel.currentSubDistrict"
-            :rules="[(val:string) => !!val || `${'กรุณาเลือก แขวง / ตำบล'}`]"
-            @update:model-value="(value:string) => selectSubDistrict(value, '2')"
-            @filter="(inputValue:string,
-                      doneFn:Function) => storeLinkCenter.filterSelector(inputValue, doneFn,'subdistrictCOps'
-                      ) "
-          />
-        </div>
-        <div class="col-xs-6 col-sm-6 col-md-3">
-          <q-input
-            dense
-            readonly
-            outlined
-            lazy-rules
-            hide-bottom-space
-            v-model="formDataAddress.currentZipCode"
-            :label="dataLabel.registrationZipCode"
-          />
-        </div>
-      </div>
-    </div>
   </div>
 </template>

src/modules/05_placement/components/probation/DialogOrder/DialogSendToCommand.vue

@@ -82,7 +82,7 @@ const columns = ref<QTableProps["columns"]>([
 
 const modalCommand = ref<boolean>(false);
 
-/** popup ยืนยันส่งัว */
+/** popup ยืนยันส่งไปออกคำสั่ง */
 function saveOrder() {
   dialogConfirm(
     $q,
@@ -111,7 +111,7 @@ function convertText(val: string) {
     case "PENDING":
       return "รอดำเนินการ";
     case "REPORT":
-      return "ส่งไปเเต่งตั้ง";
+      return "ส่งไปออกคำสั่ง";
     case "DONE":
       return "เสร็จสิ้น";
     default:
@@ -125,6 +125,7 @@ watchEffect(() => {
   }
 });
 </script>
+
 <template>
   <q-dialog v-model="props.modal">
     <q-card style="width: 1200px; max-width: 80vw">
@@ -179,7 +180,7 @@ watchEffect(() => {
           :filter="filterKeyword"
           row-key="id"
           :visible-columns="visibleColumns"
-          selection="multiple"
+          selection="single"
           v-model:selected="selected"
         >
           <template v-slot:header-selection="scope">
@@ -232,7 +233,6 @@ watchEffect(() => {
       </q-card-actions>
     </q-card>
   </q-dialog>
-
   <DialogCreateCommand
     v-model:modal="modalCommand"
     :command-type-code="'C-PM-10'"

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

@@ -134,7 +134,7 @@ function convertText(val: string) {
     case "PENDING":
       return "รอดำเนินการ";
     case "REPORT":
-      return "ส่งไปเเต่งตั้ง";
+      return "ส่งไปออกคำสั่ง";
     case "DONE":
       return "เสร็จสิ้น";
     default: