no message
This commit is contained in:
parent
d5ee366ea2
commit
995a09c1f5
4 changed files with 59 additions and 12 deletions
|
|
@ -57,10 +57,12 @@ export default {
|
|||
yearOptionsOrder: () => `${order}/order/fiscal-year`,
|
||||
createOrder: () => `${order}/order/detail`,
|
||||
listOrder: () => `${order}/order`,
|
||||
detailOrder:(orderId:string) => `${order}/order/detail/${orderId}`,
|
||||
deleteOrder:(orderId:string) => `${order}/order/${orderId}`,
|
||||
detailOrder: (orderId: string) => `${order}/order/detail/${orderId}`,
|
||||
deleteOrder: (orderId: string) => `${order}/order/${orderId}`,
|
||||
typeOrder: () => `${order}/order/order-type`,
|
||||
examroundOrder: () => `${order}/order/detail/exam-round`,
|
||||
attachmentOrder: (orderId: string) => `${order}/order/attachment/${orderId}`,
|
||||
|
||||
|
||||
receiveData: () => `${receive}`,
|
||||
receiveDataId: (id: string) => `${receive}/${id}`,
|
||||
|
|
|
|||
|
|
@ -422,10 +422,15 @@ import { VuePDF, usePDF } from "@tato30/vue-pdf";
|
|||
import type { PDFDocumentLoadingTask } from "pdfjs-dist/types/src/display/api";
|
||||
import type { QForm } from "quasar";
|
||||
import { useCounterMixin } from "@/stores/mixin";
|
||||
import { useRoute } from "vue-router";
|
||||
import http from "@/plugins/http";
|
||||
import config from "@/app.config";
|
||||
|
||||
const mixin = useCounterMixin();
|
||||
const { date2Thai } = mixin;
|
||||
const route = useRoute();
|
||||
|
||||
const orderId_params = route.params.orderid;
|
||||
const dialog = ref<boolean>(false);
|
||||
|
||||
// onUnmounted(() => {
|
||||
|
|
@ -433,8 +438,15 @@ const dialog = ref<boolean>(false);
|
|||
// myEventHandler(e);
|
||||
// });
|
||||
// });
|
||||
|
||||
const orderId = ref<string>("");
|
||||
onMounted(async () => {
|
||||
console.log(orderId_params);
|
||||
if (orderId_params !== undefined) {
|
||||
orderId.value == orderId_params.toString();
|
||||
}
|
||||
|
||||
fetchAttachment(orderId.value);
|
||||
|
||||
// window.addEventListener("resize", (e: any) => {
|
||||
// myEventHandler(e);
|
||||
// });
|
||||
|
|
@ -447,6 +459,15 @@ onMounted(async () => {
|
|||
}, 1000);
|
||||
});
|
||||
|
||||
const fetchAttachment = async (orderId: string) => {
|
||||
console.log(123);
|
||||
await http
|
||||
.get(config.API.attachmentOrder("08db94be-f7c6-43e2-83eb-3c5cef3a91c7"))
|
||||
.then((res) => {
|
||||
console.log(res);
|
||||
});
|
||||
};
|
||||
|
||||
// const myEventHandler = (e: any) => {
|
||||
// console.log("e", e.target.innerWidth);
|
||||
// if (vuePDFRef !== null) {
|
||||
|
|
|
|||
|
|
@ -16,6 +16,7 @@ const retireld_params = route.params.id;
|
|||
const props = defineProps({
|
||||
retireld: String,
|
||||
profileId: String,
|
||||
dataProfile: Object,
|
||||
UpdateListId: {
|
||||
type: Function,
|
||||
default: () => console.log("UpdateListId"),
|
||||
|
|
@ -112,8 +113,8 @@ const rows = ref<any>([
|
|||
watch(modal, () => {
|
||||
if (modal.value === true) {
|
||||
retireld.value = props.retireld;
|
||||
if (type_params === "officer") {
|
||||
type.value = type_params;
|
||||
if (props.dataProfile.type === "OFFICER") {
|
||||
type.value = "officer";
|
||||
} else type.value = "all";
|
||||
|
||||
fecthlistRetire();
|
||||
|
|
@ -125,8 +126,7 @@ const fecthlistRetire = async () => {
|
|||
await http
|
||||
.get(config.API.profileOrganizRoot)
|
||||
.then((res) => {
|
||||
// console.log(res);
|
||||
|
||||
console.log(res);
|
||||
const id = res.data.result[0].id;
|
||||
if (id !== "") {
|
||||
findlist(id);
|
||||
|
|
|
|||
|
|
@ -169,6 +169,7 @@ onMounted(() => {
|
|||
const round = ref<number>();
|
||||
const typeReport = ref<string>("");
|
||||
const statusReport = ref<boolean>();
|
||||
const dataProfile = ref<Object>([]);
|
||||
// fecthlist
|
||||
const fecthlistprofile = async (id: string) => {
|
||||
showLoader();
|
||||
|
|
@ -176,6 +177,7 @@ const fecthlistprofile = async (id: string) => {
|
|||
.get(config.API.listRetire(id))
|
||||
.then((res) => {
|
||||
console.log(res);
|
||||
dataProfile.value = res.data.result;
|
||||
round.value = res.data.result.round;
|
||||
statusReport.value = res.data.result.json;
|
||||
typeReport.value = res.data.result.typeReport;
|
||||
|
|
@ -358,11 +360,13 @@ const paginationLabel = (start: number, end: number, total: number) => {
|
|||
<q-card class="col-12 q-pa-md">
|
||||
<div class="row col-12 q-pb-sm">
|
||||
<AddList
|
||||
:dataProfile="dataProfile"
|
||||
:retireld="retireld"
|
||||
:profile-id="profileId"
|
||||
:UpdateListId="UpdateListId"
|
||||
v-if="
|
||||
statusReport === false && (typeReport == 'ADD' || typeReport == '' || typeReport == null)
|
||||
statusReport === false &&
|
||||
(typeReport == 'ADD' || typeReport == '' || typeReport == null)
|
||||
"
|
||||
/>
|
||||
|
||||
|
|
@ -459,11 +463,21 @@ const paginationLabel = (start: number, end: number, total: number) => {
|
|||
<q-th auto-width />
|
||||
<q-th
|
||||
auto-width
|
||||
v-if="(typeReport === 'EDIT' || typeReport === null || typeReport === '') && statusReport === false"
|
||||
v-if="
|
||||
(typeReport === 'EDIT' ||
|
||||
typeReport === null ||
|
||||
typeReport === '') &&
|
||||
statusReport === false
|
||||
"
|
||||
/>
|
||||
<q-th
|
||||
auto-width
|
||||
v-if="(typeReport === 'REMOVE' || typeReport === null || typeReport === '') && statusReport === false"
|
||||
v-if="
|
||||
(typeReport === 'REMOVE' ||
|
||||
typeReport === null ||
|
||||
typeReport === '') &&
|
||||
statusReport === false
|
||||
"
|
||||
/>
|
||||
</q-tr>
|
||||
</template>
|
||||
|
|
@ -535,7 +549,12 @@ const paginationLabel = (start: number, end: number, total: number) => {
|
|||
|
||||
<q-td
|
||||
auto-width
|
||||
v-if="(typeReport === 'EDIT' || typeReport === null || typeReport === '') && statusReport === false"
|
||||
v-if="
|
||||
(typeReport === 'EDIT' ||
|
||||
typeReport === null ||
|
||||
typeReport === '') &&
|
||||
statusReport === false
|
||||
"
|
||||
>
|
||||
<q-btn
|
||||
flat
|
||||
|
|
@ -555,7 +574,12 @@ const paginationLabel = (start: number, end: number, total: number) => {
|
|||
</q-td>
|
||||
<q-td
|
||||
auto-width
|
||||
v-if="(typeReport === 'REMOVE' || typeReport === null || typeReport === '') && statusReport === false"
|
||||
v-if="
|
||||
(typeReport === 'REMOVE' ||
|
||||
typeReport === null ||
|
||||
typeReport === '') &&
|
||||
statusReport === false
|
||||
"
|
||||
>
|
||||
<q-btn
|
||||
flat
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue