fix request api search person add body system
This commit is contained in:
parent
9cd792e90c
commit
a6f7b4e587
9 changed files with 25 additions and 4 deletions
|
|
@ -46,7 +46,7 @@ export default {
|
||||||
`${profile}search/new-employee/oc/${id}`,
|
`${profile}search/new-employee/oc/${id}`,
|
||||||
profileSearchNewEmOcLeaveId: (id: string) =>
|
profileSearchNewEmOcLeaveId: (id: string) =>
|
||||||
`${profile}search/new-employee/oc/leave/${id}`,
|
`${profile}search/new-employee/oc/leave/${id}`,
|
||||||
profileSearchPersonal: () => `${profile}search-personal`,
|
// profileSearchPersonal: () => `${profile}search-personal`, // ไม่ได้เรียกใช้แล้ว
|
||||||
profileEmployeeTempId: (id: string) => `${profile}employee/temp/${id}`,
|
profileEmployeeTempId: (id: string) => `${profile}employee/temp/${id}`,
|
||||||
|
|
||||||
profileCoupleId: (profileId: string) => `${profile}couple/${profileId}`,
|
profileCoupleId: (profileId: string) => `${profile}couple/${profileId}`,
|
||||||
|
|
@ -197,7 +197,7 @@ export default {
|
||||||
employmentHistoryId: (employmentId: string) =>
|
employmentHistoryId: (employmentId: string) =>
|
||||||
`${profile}employment/history/${employmentId}`,
|
`${profile}employment/history/${employmentId}`,
|
||||||
|
|
||||||
searchPersonal: () => `${profile}search-personal`,
|
// searchPersonal: () => `${profile}search-personal`, // ไม่ได้เรียกใช้แล้ว
|
||||||
|
|
||||||
//สร้างข้อมูลราชการ
|
//สร้างข้อมูลราชการ
|
||||||
createProfileOfficer: () => `${profile}information/officer`,
|
createProfileOfficer: () => `${profile}information/officer`,
|
||||||
|
|
|
||||||
|
|
@ -92,6 +92,10 @@ const props = defineProps({
|
||||||
type: String,
|
type: String,
|
||||||
default: "multiple",
|
default: "multiple",
|
||||||
},
|
},
|
||||||
|
system: {
|
||||||
|
type: String || undefined,
|
||||||
|
default: "",
|
||||||
|
},
|
||||||
});
|
});
|
||||||
|
|
||||||
/**ส่งค่ากลับหน้าหลัก */
|
/**ส่งค่ากลับหน้าหลัก */
|
||||||
|
|
@ -135,6 +139,7 @@ async function getSearch() {
|
||||||
const body = {
|
const body = {
|
||||||
fieldName: type.value,
|
fieldName: type.value,
|
||||||
keyword: search.value ? search.value.trim() : "",
|
keyword: search.value ? search.value.trim() : "",
|
||||||
|
system: props.system ?? undefined,
|
||||||
};
|
};
|
||||||
await http
|
await http
|
||||||
.post(
|
.post(
|
||||||
|
|
|
||||||
|
|
@ -1108,6 +1108,7 @@ onMounted(async () => {
|
||||||
btn-title="เพิ่มรายชื่อผู้ถูกร้องเรียน"
|
btn-title="เพิ่มรายชื่อผู้ถูกร้องเรียน"
|
||||||
:save="addPerson"
|
:save="addPerson"
|
||||||
:selected-data="mainStore.rowsAdd"
|
:selected-data="mainStore.rowsAdd"
|
||||||
|
:system="(route.meta?.Key as string) || undefined"
|
||||||
/>
|
/>
|
||||||
|
|
||||||
<PopupPersonal
|
<PopupPersonal
|
||||||
|
|
|
||||||
|
|
@ -1029,7 +1029,10 @@ onMounted(async () => {
|
||||||
class="text-center"
|
class="text-center"
|
||||||
>
|
>
|
||||||
<q-btn
|
<q-btn
|
||||||
v-if="props.row.disciplineRejectDoc && props.row.disciplineRejectDoc.length > 0"
|
v-if="
|
||||||
|
props.row.disciplineRejectDoc &&
|
||||||
|
props.row.disciplineRejectDoc.length > 0
|
||||||
|
"
|
||||||
flat
|
flat
|
||||||
round
|
round
|
||||||
dense
|
dense
|
||||||
|
|
@ -1774,6 +1777,7 @@ onMounted(async () => {
|
||||||
btn-title="เพิ่มรายชื่อผู้ถูกร้องเรียน"
|
btn-title="เพิ่มรายชื่อผู้ถูกร้องเรียน"
|
||||||
:selected-data="mainStore.rowsAdd"
|
:selected-data="mainStore.rowsAdd"
|
||||||
:save="addPerson"
|
:save="addPerson"
|
||||||
|
:system="(route.meta?.Key as string) || undefined"
|
||||||
/>
|
/>
|
||||||
|
|
||||||
<DialogDirector
|
<DialogDirector
|
||||||
|
|
|
||||||
|
|
@ -1950,6 +1950,7 @@ onMounted(async () => {
|
||||||
btn-title="เพิ่มรายชื่อผู้ถูกสอบสวน"
|
btn-title="เพิ่มรายชื่อผู้ถูกสอบสวน"
|
||||||
:save="addPerson"
|
:save="addPerson"
|
||||||
:selected-data="mainStore.rowsAdd"
|
:selected-data="mainStore.rowsAdd"
|
||||||
|
:system="(route.meta?.Key as string) || undefined"
|
||||||
/>
|
/>
|
||||||
|
|
||||||
<DialogDirector
|
<DialogDirector
|
||||||
|
|
|
||||||
|
|
@ -2,6 +2,7 @@
|
||||||
import { ref, reactive, watch } from "vue";
|
import { ref, reactive, watch } from "vue";
|
||||||
import { useQuasar } from "quasar";
|
import { useQuasar } from "quasar";
|
||||||
import type { QTableProps } from "quasar";
|
import type { QTableProps } from "quasar";
|
||||||
|
import { useRoute } from "vue-router";
|
||||||
|
|
||||||
import http from "@/plugins/http";
|
import http from "@/plugins/http";
|
||||||
import config from "@/app.config";
|
import config from "@/app.config";
|
||||||
|
|
@ -26,6 +27,7 @@ const pagination = ref({
|
||||||
rowsPerPage: 10,
|
rowsPerPage: 10,
|
||||||
});
|
});
|
||||||
|
|
||||||
|
const route = useRoute();
|
||||||
const modalPersonal = ref<boolean>(false);
|
const modalPersonal = ref<boolean>(false);
|
||||||
const personId = ref<string>("");
|
const personId = ref<string>("");
|
||||||
const searchRef = ref<any>(null);
|
const searchRef = ref<any>(null);
|
||||||
|
|
@ -193,6 +195,7 @@ async function getSearch() {
|
||||||
const body = {
|
const body = {
|
||||||
fieldName: type.value,
|
fieldName: type.value,
|
||||||
keyword: search.value,
|
keyword: search.value,
|
||||||
|
system: (route.meta?.Key as string) || undefined,
|
||||||
};
|
};
|
||||||
await http
|
await http
|
||||||
.post(
|
.post(
|
||||||
|
|
|
||||||
|
|
@ -540,7 +540,7 @@ onMounted(() => {
|
||||||
}}
|
}}
|
||||||
</div>
|
</div>
|
||||||
<div v-else>
|
<div v-else>
|
||||||
{{ col.value?col.value:'-' }}
|
{{ col.value ? col.value : "-" }}
|
||||||
</div>
|
</div>
|
||||||
</q-td>
|
</q-td>
|
||||||
</q-tr>
|
</q-tr>
|
||||||
|
|
@ -766,6 +766,7 @@ onMounted(() => {
|
||||||
:save="addPerson"
|
:save="addPerson"
|
||||||
:selected-data="mainStore.rowsAdd"
|
:selected-data="mainStore.rowsAdd"
|
||||||
selecetSwitch="single"
|
selecetSwitch="single"
|
||||||
|
:system="(route.meta?.Key as string) || undefined"
|
||||||
/>
|
/>
|
||||||
|
|
||||||
<DialogHistory
|
<DialogHistory
|
||||||
|
|
|
||||||
|
|
@ -3,6 +3,7 @@ import { ref, reactive, watch, onMounted, computed, type PropType } from "vue";
|
||||||
import { useQuasar } from "quasar";
|
import { useQuasar } from "quasar";
|
||||||
import http from "@/plugins/http";
|
import http from "@/plugins/http";
|
||||||
import config from "@/app.config";
|
import config from "@/app.config";
|
||||||
|
import { useRoute } from "vue-router";
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* importTypr
|
* importTypr
|
||||||
|
|
@ -48,6 +49,7 @@ const props = defineProps({
|
||||||
});
|
});
|
||||||
const emit = defineEmits(["formDataReturn"]);
|
const emit = defineEmits(["formDataReturn"]);
|
||||||
|
|
||||||
|
const route = useRoute();
|
||||||
const isReadonly = computed(() => (actionType.value === "VIEW" ? true : false)); //อ่านอย่างเดียว
|
const isReadonly = computed(() => (actionType.value === "VIEW" ? true : false)); //อ่านอย่างเดียว
|
||||||
const modalPersonal = ref<boolean>(false);
|
const modalPersonal = ref<boolean>(false);
|
||||||
const personId = ref<string>("");
|
const personId = ref<string>("");
|
||||||
|
|
@ -173,6 +175,7 @@ function searchInput() {
|
||||||
const body = {
|
const body = {
|
||||||
fieldName: type.value,
|
fieldName: type.value,
|
||||||
keyword: search.value ? search.value.trim() : "",
|
keyword: search.value ? search.value.trim() : "",
|
||||||
|
system: (route.meta?.Key as string) || undefined,
|
||||||
};
|
};
|
||||||
http
|
http
|
||||||
.post(
|
.post(
|
||||||
|
|
|
||||||
|
|
@ -7,6 +7,7 @@ import config from "@/app.config";
|
||||||
import http from "@/plugins/http";
|
import http from "@/plugins/http";
|
||||||
import { useRouter } from "vue-router";
|
import { useRouter } from "vue-router";
|
||||||
import { useCounterMixin } from "@/stores/mixin";
|
import { useCounterMixin } from "@/stores/mixin";
|
||||||
|
import { useRoute } from "vue-router";
|
||||||
|
|
||||||
import type {
|
import type {
|
||||||
DataOption,
|
DataOption,
|
||||||
|
|
@ -20,6 +21,7 @@ import PopupPersonal from "@/components/Dialogs/PopupPersonalNew.vue";
|
||||||
|
|
||||||
const $q = useQuasar();
|
const $q = useQuasar();
|
||||||
const router = useRouter();
|
const router = useRouter();
|
||||||
|
const route = useRoute();
|
||||||
const mixin = useCounterMixin();
|
const mixin = useCounterMixin();
|
||||||
const {
|
const {
|
||||||
showLoader,
|
showLoader,
|
||||||
|
|
@ -237,6 +239,7 @@ async function searchInput(check: boolean) {
|
||||||
const body = {
|
const body = {
|
||||||
fieldName: type.value,
|
fieldName: type.value,
|
||||||
keyword: search.value.trim(),
|
keyword: search.value.trim(),
|
||||||
|
system: (route.meta?.Key as string) || undefined,
|
||||||
};
|
};
|
||||||
await http
|
await http
|
||||||
.post(
|
.post(
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue