Merge branch 'develop'

2025-07-21 15:51:36 +07:00 · 2025-07-21 15:51:36 +07:00 · 760556e558
commit 760556e558
parent b51b26b4f5 1888ce2f8b
10 changed files with 22 additions and 21 deletions
--- a/src/modules/02_transfer/views/AddTransfer.vue
+++ b/src/modules/02_transfer/views/AddTransfer.vue
@ -46,7 +46,7 @@ async function createTransfer() {
  const formData = new FormData();
  formData.append("Organization", tranferOrg.value);
  formData.append("Reason", noteReason.value);
-  formData.append("file", files.value);
+  formData.append("file", files.value ? files.value : null);
  await http
    .post(config.API.listtransfer(), formData)
    .then((res) => {
@ -161,10 +161,7 @@ onMounted(() => {
                    class="col-xs-12 col-sm-12 inputgreen"
                    outlined
                    dense
-                    lazy-rules
-                    hide-bottom-space
                    accept=".pdf"
-                    :rules="[(val: string) => !!val || 'กรุณาเลือกไฟล์เอกสารเพิ่มเติม']"
                    label="เอกสารเพิ่มเติม"
                  >
                    <template v-slot:prepend>
@ -172,7 +169,10 @@ onMounted(() => {
                  ></q-file>
                </div>

-                <div class="col-12 row" v-if="routeName != 'addTransfer'">
+                <div
+                  class="col-12 row"
+                  v-if="routeName != 'addTransfer' && files && files.length > 0"
+                >
                  <q-card bordered flat class="full-width">
                    <div
                      class="bg-grey-1 q-pa-sm col-12 row items-center text-primary"
@ -189,12 +189,14 @@ onMounted(() => {
                        </q-item-section>
                        <q-item-section avatar>
                          <q-btn
-                            color="teal-5"
+                            color="blue"
                            round
                            flat
                            icon="mdi-download"
                            @click="fileOpen(file.pathName)"
-                          ></q-btn>
+                          >
+                            <q-tooltip> ดาวน์โหลดไฟล์ </q-tooltip>
+                          </q-btn>
                        </q-item-section>
                      </q-item>
                    </q-list>
--- a/src/modules/03_retire/views/addRetire.vue
+++ b/src/modules/03_retire/views/addRetire.vue
@ -161,7 +161,7 @@ async function onSubmit() {
        dateLeave.value !== null ? dateToISO(dateLeave.value) : ""
      );
      formData.append("Reason", noteReason.value);
-      formData.append("file", files.value);
+      formData.append("file", files.value ? files.value : null);
      if (noteReason.value == "OTHER") {
        formData.append("remark", remark.value);
      }
@ -470,10 +470,7 @@ onMounted(async () => {
                class="col-xs-12 col-sm-12 inputgreen"
                outlined
                dense
-                lazy-rules
-                hide-bottom-space
                accept=".pdf"
-                :rules="[(val: string) => !!val || 'กรุณาเลือกเอกสารเพิ่มเติม']"
                label="เอกสารเพิ่มเติม"
              >
                <template v-slot:prepend>
@ -481,7 +478,10 @@ onMounted(async () => {
              ></q-file>
            </div>

-            <div class="col-12 row" v-if="routeName != 'AddRetire'">
+            <div
+              class="col-12 row"
+              v-if="routeName != 'AddRetire' && files && files.length > 0"
+            >
              <q-card bordered flat class="row col-12 text-dark q-mt-sm">
                <div
                  class="bg-grey-1 q-pa-sm col-12 row items-center text-primary"
--- a/src/modules/03_retire/views/result.vue
+++ b/src/modules/03_retire/views/result.vue
@ -176,8 +176,7 @@ function saveForm() {
        suggestFriendsReason.value == "")) ||
    futureWork.value.length === 0 ||
    (futureWork.value === 1 &&
-      (futureWorkReason.value == null || futureWorkReason.value == "")) ||
-    suggestion.value.length < 1
+      (futureWorkReason.value == null || futureWorkReason.value == ""))
  ) {
    hasError = true;
  } else {
--- a/src/modules/07_appealComplain/views/Form.vue
+++ b/src/modules/07_appealComplain/views/Form.vue
@ -335,7 +335,7 @@ watch(
                          flat
                          icon="mdi-download"
                          outline
-                          color="primary"
+                          color="blue"
                          @click="downLoadFile(file.pathName)"
                        >
                          <q-tooltip>ดาวห์โหลดเอกสาร</q-tooltip>
--- a/src/modules/11_probation/component/01_Assign.vue
+++ b/src/modules/11_probation/component/01_Assign.vue
@ -1065,7 +1065,7 @@ onMounted(async () => {
            flat
            dense
            icon="mdi-download"
-            color="primary"
+            color="blue"
          >
            <q-tooltip>ดาวน์โหลด</q-tooltip>
            <q-menu>
--- a/src/modules/11_probation/component/06_EvaluateResult.vue
+++ b/src/modules/11_probation/component/06_EvaluateResult.vue
@ -269,7 +269,7 @@ onMounted(async () => {
        dense
        round
        icon="mdi-download"
-        color="primary"
+        color="blue"
      >
        <q-tooltip>ดาวน์โหลด</q-tooltip>
        <q-menu>
--- a/src/modules/11_probation/component/editPage/01_result.vue
+++ b/src/modules/11_probation/component/editPage/01_result.vue
@ -549,7 +549,7 @@ onMounted(async () => {
      >
      </q-select>
      <q-space />
-      <q-btn flat rounded dense icon="mdi-download" color="primary">
+      <q-btn flat rounded dense icon="mdi-download" color="blue">
        <q-tooltip>ดาวน์โหลด</q-tooltip>
        <q-menu>
          <q-list style="min-width: 150px">
--- a/src/modules/13_portfolio/views/Add.vue
+++ b/src/modules/13_portfolio/views/Add.vue
@ -263,7 +263,7 @@ onMounted(() => {
                        </q-item-section>
                        <q-item-section avatar>
                          <q-btn
-                            color="teal-5"
+                            color="blue"
                            round
                            flat
                            icon="mdi-download"
--- a/src/modules/14_IDP/views/main.vue
+++ b/src/modules/14_IDP/views/main.vue
@ -420,7 +420,7 @@ onMounted(async () => {
                        round
                        dense
                        flat
-                        color="primary"
+                        color="blue"
                        size="12px"
                        @click.pervent="onDownloadFile(props.row.id)"
                      >
--- a/src/modules/14_IDP/views/registry.vue
+++ b/src/modules/14_IDP/views/registry.vue
@ -524,7 +524,7 @@ onMounted(() => {
                    />
                    <q-btn
                      v-else
-                      color="primary"
+                      color="blue"
                      flat
                      dense
                      rounded