Merge branch 'develop' of github.com:Frappet/bma-ehr-frontend into develop

# Conflicts: # src/modules/03_recruiting/components/Address.vue # src/modules/03_recruiting/views/03_editor/index.vue # src/modules/04_registryPerson/components/Dialog/02_Address.vue # src/modules/04_registryPerson/components/detail/PersonalInformation/03_Address.vue # src/modules/05_placement/components/PersonalDetail/CheckInformation/02_FormAddress.vue # src/modules/05_placement/components/PersonalDetail/Information/Address.vue
2024-11-27 18:18:21 +07:00 · 2024-11-27 18:18:21 +07:00 · 563f3e1b16
commit 563f3e1b16
parent 1f548d7459 62f1c81841
95 changed files with 580 additions and 489 deletions
--- a/src/modules/15_development/components/ProjectDetail.vue
+++ b/src/modules/15_development/components/ProjectDetail.vue
@ -13,7 +13,7 @@ import type {
  DataOptionTechnique,
  FormProjectDetail,
  DataOption,
-  StrategyNode
+  StrategyNode,
 } from "@/modules/15_development/interface/index/Main";
 import type { DataStrategic } from "@/modules/15_development/interface/response/Main";

@ -310,12 +310,24 @@ function fetchTree() {
 }

 /** Main save */
-function onSubmit() {
+async function onSubmit() {
  showLoader();
-  http
+  await http
    .put(config.API.developmentMainTab("tab3", projectId.value), {
      ...formData,
      totalDate: formData.totalDate === "" ? null : formData.totalDate,
+      projectDayBackPlanned:
+        formData.projectDayBackPlanned === ""
+          ? null
+          : formData.projectDayBackPlanned,
+      projectDayHoldPlanned:
+        formData.projectDayHoldPlanned === ""
+          ? null
+          : formData.projectDayHoldPlanned,
+      projectNigthHoldPlanned:
+        formData.projectNigthHoldPlanned === ""
+          ? null
+          : formData.projectNigthHoldPlanned,
      reasonPlanned70: reasonPlanned70.value,
      reasonPlanned20: reasonPlanned20.value,
      reasonPlanned10: reasonPlanned10.value,
@ -392,6 +404,21 @@ function updatetotalDate() {
 function onNextTab() {
  step.value == "next" ? props.nextStep() : props.prevStep();
 }
+
+const isCheckLocation = computed(() => {
+  if (formData?.developmentAddresss?.length !== 0) {
+    if (
+      formData.developmentAddresss[formData.developmentAddresss.length - 1]
+        .address !== "" &&
+      formData.developmentAddresss[formData.developmentAddresss.length - 1]
+        .provinceId !== ""
+    ) {
+      return true;
+    } else return false;
+  }
+  return true;
+});
+
 /**
 * ดึงข้อมูลเมื่อคอมโพเนนต์โหลดเสร็จสมบูรณ์
 */
@ -465,6 +492,7 @@ defineExpose({
                    </template>
                  </q-input>
                  <q-tree
+                    style="height: 350px; overflow: scroll"
                    dense
                    :nodes="nodes"
                    selected-color="primary"
@ -529,6 +557,7 @@ defineExpose({
                    </template>
                  </q-input>
                  <q-tree
+                    style="height: 350px; overflow: scroll"
                    dense
                    :nodes="nodes"
                    node-key="id"
@ -680,8 +709,9 @@ defineExpose({

            <div class="col-12 q-mt-md">
              <span class="text-bold">สถานที่ดำเนินการ</span>
+
              <q-btn
-                v-if="!checkRoutePermission"
+                v-if="!checkRoutePermission && isCheckLocation"
                dense
                flat
                round
@ -785,11 +815,15 @@ defineExpose({
                  value="GO_BLACK"
                  label="ไป-กลับ"
                  v-model="formData.isBackPlanned"
-                  @update:model-value="props.onCheckChangeData()"
+                  @update:model-value="
+                    props.onCheckChangeData(),
+                      (formData.projectDayBackPlanned = null)
+                  "
                ></q-checkbox>
              </div>
              <div class="col-12 col-md-4">
                <q-input
+                  :disable="!formData.isBackPlanned"
                  :readonly="
                    store.projectStatus === 'FINISH' || checkRoutePermission
                  "
@ -816,11 +850,16 @@ defineExpose({
                  value="HOLD"
                  label="พักค้าง"
                  v-model="formData.isHoldPlanned"
-                  @update:model-value="props.onCheckChangeData()"
+                  @update:model-value="
+                    props.onCheckChangeData(),
+                      (formData.projectDayHoldPlanned = null),
+                      (formData.projectNigthHoldPlanned = null)
+                  "
                ></q-checkbox>
              </div>
              <div class="col-12 col-md-4">
                <q-input
+                  :disable="!formData.isHoldPlanned"
                  :readonly="
                    store.projectStatus === 'FINISH' || checkRoutePermission
                  "
@ -836,6 +875,7 @@ defineExpose({
              </div>
              <div class="col-12 col-md-4">
                <q-input
+                  :disable="!formData.isHoldPlanned"
                  :readonly="
                    store.projectStatus === 'FINISH' || checkRoutePermission
                  "
--- a/src/modules/15_development/components/Record.vue
+++ b/src/modules/15_development/components/Record.vue
@ -64,7 +64,7 @@ const baseColumns = ref<QTableProps["columns"]>([
  {
    name: "fullName",
    align: "left",
-    label: "ชื่อ - นามสกุล",
+    label: "ชื่อ-นามสกุล",
    sortable: true,
    field: "fullName",
    headerStyle: "font-size: 14px",
--- a/src/modules/15_development/components/Target.vue
+++ b/src/modules/15_development/components/Target.vue
@ -374,7 +374,9 @@ function onSubmitRelate() {
            amount: formGroupRelate.amount,
          }
        )
-        .then(() => {
+        .then(async () => {
+          await fetchData(projectId.value);
+          onClickCloseDialog();
          success($q, "บันทึกข้อมูลสำเร็จ");
        })
        .catch((err) => {
@ -395,7 +397,9 @@ function onSubmitRelate() {
            amount: formGroupRelate.amount,
          }
        )
-        .then(() => {
+        .then(async () => {
+          await fetchData(projectId.value);
+          onClickCloseDialog();
          success($q, "บันทึกข้อมูลสำเร็จ");
        })
        .catch((err) => {
@ -405,10 +409,6 @@ function onSubmitRelate() {
          hideLoader();
        });
    }
-    setTimeout(() => {
-      fetchData(projectId.value);
-      onClickCloseDialog();
-    }, 100);
  });
 }

@ -434,7 +434,7 @@ function onClickCloseDialog() {
  modalRelate.value = false;
  cleanFormData();
  fetchType();
-  fetchData(projectId.value);
+  // fetchData(projectId.value);
 }

 /**
--- a/src/modules/15_development/components/history/AddPage.vue
+++ b/src/modules/15_development/components/history/AddPage.vue
@ -26,7 +26,7 @@ const order = ref<string>(""); //เลขที่คำสั่ง/เลข
 /** ตัวแปรข้อมูลข้าราชการ */
 const formMain = reactive<FormAddHistory>({
  id: "",
-  name: "", //ชื่อ - นามสกุล
+  name: "", //ชื่อ-นามสกุล
  prefix: "", //คำนำหน้าชื่อ
  rank: "", //ยศ
  firstName: "", //ชื่อ
@ -147,7 +147,7 @@ onMounted(async () => {
              </div>
              <div class="row col-12">
                <div class="col-sm-12 col-md-5 text-grey-6 text-weight-medium">
-                  ชื่อ - นามสกุล
+                  ชื่อ-นามสกุล
                </div>

                <div class="col-12 col-sm-12 col-md-7">
--- a/src/modules/15_development/components/history/DialogGov.vue
+++ b/src/modules/15_development/components/history/DialogGov.vue
@ -56,7 +56,7 @@ const govOp = ref<DataOption[]>([
  },
  {
    id: "fullName",
-    name: "ชื่อ - นามสกุล",
+    name: "ชื่อ-นามสกุล",
  },
 ]);

@ -82,7 +82,7 @@ const columns = ref<QTableProps["columns"]>([
  {
    name: "name",
    align: "left",
-    label: "ชื่อ - นามสกุล",
+    label: "ชื่อ-นามสกุล",
    sortable: true,
    field: "name",
    headerStyle: "font-size: 14px",
--- a/src/modules/15_development/components/historyEmployee/AddPage.vue
+++ b/src/modules/15_development/components/historyEmployee/AddPage.vue
@ -29,7 +29,7 @@ const order = ref<string>("");
 /** ตัวแปรข้อมูลข้าราชการ */
 const formMain = reactive<FormAddHistoryEmployee>({
  id: "",
-  name: "", //ชื่อ - นามสกุล
+  name: "", //ชื่อ-นามสกุล
  prefix: "", //คำนำหน้าชื่อ
  rank: "", //ยศ
  firstName: "", //ชื่อ
@ -159,7 +159,7 @@ onMounted(() => {
              </div>
              <div class="row col-12">
                <div class="col-sm-12 col-md-5 text-grey-6 text-weight-medium">
-                  ชื่อ - นามสกุล
+                  ชื่อ-นามสกุล
                </div>

                <div class="col-12 col-sm-12 col-md-7">
--- a/src/modules/15_development/interface/index/Main.ts
+++ b/src/modules/15_development/interface/index/Main.ts
@ -90,7 +90,12 @@ interface FormProjectDetail {
  dateStart: Date | null; //วันที่เริ่มต้น
  dateEnd: Date | null; //วันที่สิ้นสุด
  totalDate: number | null | string; //รวมระยะเวลา (วัน)
-  developmentAddresss: [{ address: string; provinceId: string }]; //ที่อยู่ ,จังหวัด
+  developmentAddresss: DevelopmentAddress[]; //ที่อยู่ ,จังหวัด
+}
+
+interface DevelopmentAddress {
+  address: string;
+  provinceId: string;
 }

 interface DataHistory {
--- a/src/modules/15_development/views/EmployeeHistory.vue
+++ b/src/modules/15_development/views/EmployeeHistory.vue
@ -88,7 +88,7 @@ const columns = ref<QTableProps["columns"]>([
  {
    name: "name",
    align: "left",
-    label: "ชื่อ - นามสกุล",
+    label: "ชื่อ-นามสกุล",
    sortable: true,
    field: "name",
    headerStyle: "font-size: 14px",
@ -388,7 +388,6 @@ onMounted(async () => {
            map-options
            :options="columns"
            option-value="name"
-            style="min-width: 140px"
          />
        </div>
      </q-toolbar>
--- a/src/modules/15_development/views/History.vue
+++ b/src/modules/15_development/views/History.vue
@ -65,7 +65,7 @@ const columns = ref<QTableProps["columns"]>([
  {
    name: "name",
    align: "left",
-    label: "ชื่อ - นามสกุล",
+    label: "ชื่อ-นามสกุล",
    sortable: true,
    field: "name",
    headerStyle: "font-size: 14px",
@ -409,7 +409,6 @@ onMounted(() => {
            map-options
            :options="columns"
            option-value="name"
-            style="min-width: 140px"
          />
        </div>
      </q-toolbar>
--- a/src/modules/15_development/views/MainPage.vue
+++ b/src/modules/15_development/views/MainPage.vue
@ -417,19 +417,18 @@ onMounted(() => {
            map-options
            @update:model-value="fetchListProjectNew"
          />
-          <q-toolbar-title>
-            <q-btn
-              v-if="checkPermission($route)?.attrIsCreate"
-              flat
-              round
-              dense
-              icon="add"
-              color="primary"
-              @click="onAdd()"
-            >
-              <q-tooltip>เพิ่มข้อมูล</q-tooltip>
-            </q-btn>
-          </q-toolbar-title>
+
+          <q-btn
+            v-if="checkPermission($route)?.attrIsCreate"
+            flat
+            round
+            dense
+            icon="add"
+            color="primary"
+            @click="onAdd()"
+          >
+            <q-tooltip>เพิ่มข้อมูล</q-tooltip>
+          </q-btn>

          <q-space />

@ -480,7 +479,6 @@ onMounted(() => {
            map-options
            :options="columns"
            option-value="name"
-            
            style="min-width: 140px"
          />
        </q-toolbar>