fix bug
This commit is contained in:
parent
f212dce287
commit
1732209a2f
16 changed files with 34 additions and 28 deletions
|
|
@ -266,7 +266,7 @@ const treeId = ref<string>("");
|
||||||
*/
|
*/
|
||||||
function onClickAgency(level: number, node: OrgTree | {}) {
|
function onClickAgency(level: number, node: OrgTree | {}) {
|
||||||
dialogAgency.value = !dialogAgency.value;
|
dialogAgency.value = !dialogAgency.value;
|
||||||
orgLevel.value = level;
|
orgLevel.value = level ? level : 0;
|
||||||
dataNode.value = node;
|
dataNode.value = node;
|
||||||
actionType.value = "ADD";
|
actionType.value = "ADD";
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -24,14 +24,7 @@ const isLoadStructureTree = ref<boolean>(true);
|
||||||
const $q = useQuasar();
|
const $q = useQuasar();
|
||||||
const route = useRoute();
|
const route = useRoute();
|
||||||
const { fetchStructureTree } = useStructureTree();
|
const { fetchStructureTree } = useStructureTree();
|
||||||
const {
|
const { date2Thai, dateToISO, messageError } = useCounterMixin();
|
||||||
showLoader,
|
|
||||||
hideLoader,
|
|
||||||
date2Thai,
|
|
||||||
dateToISO,
|
|
||||||
messageError,
|
|
||||||
monthYear2Thai,
|
|
||||||
} = useCounterMixin();
|
|
||||||
|
|
||||||
/** Filter*/
|
/** Filter*/
|
||||||
const detailReport = ref<any>();
|
const detailReport = ref<any>();
|
||||||
|
|
@ -72,6 +65,7 @@ const isLoadPDF = ref<boolean>(false);
|
||||||
const numOfPages = ref<number>(0);
|
const numOfPages = ref<number>(0);
|
||||||
const page = ref<number>(1);
|
const page = ref<number>(1);
|
||||||
const pdfSrc = ref<any>();
|
const pdfSrc = ref<any>();
|
||||||
|
const splitterModel = ref<number>(14);
|
||||||
|
|
||||||
/** tree*/
|
/** tree*/
|
||||||
const filterTree = ref<string>("");
|
const filterTree = ref<string>("");
|
||||||
|
|
@ -479,6 +473,8 @@ onMounted(() => {
|
||||||
</div>
|
</div>
|
||||||
<div class="col-lg-9 col-md-9 col-sm-9 col-xs-12 col-xs-12 flex">
|
<div class="col-lg-9 col-md-9 col-sm-9 col-xs-12 col-xs-12 flex">
|
||||||
<q-splitter
|
<q-splitter
|
||||||
|
disable
|
||||||
|
v-model="splitterModel"
|
||||||
horizontal
|
horizontal
|
||||||
style="
|
style="
|
||||||
height: 75vh;
|
height: 75vh;
|
||||||
|
|
|
||||||
|
|
@ -22,14 +22,8 @@ import LoadView from "@/components/LoadView.vue";
|
||||||
const $q = useQuasar();
|
const $q = useQuasar();
|
||||||
const route = useRoute();
|
const route = useRoute();
|
||||||
const { fetchStructureTree } = useStructureTree();
|
const { fetchStructureTree } = useStructureTree();
|
||||||
const {
|
const { date2Thai, dateToISO, messageError, monthYear2Thai } =
|
||||||
showLoader,
|
useCounterMixin();
|
||||||
hideLoader,
|
|
||||||
date2Thai,
|
|
||||||
dateToISO,
|
|
||||||
messageError,
|
|
||||||
monthYear2Thai,
|
|
||||||
} = useCounterMixin();
|
|
||||||
|
|
||||||
/** Filter*/
|
/** Filter*/
|
||||||
const reportType = ref<string>("");
|
const reportType = ref<string>("");
|
||||||
|
|
@ -74,6 +68,7 @@ const isLoadPDF = ref<boolean>(false);
|
||||||
const numOfPages = ref<number>(0);
|
const numOfPages = ref<number>(0);
|
||||||
const page = ref<number>(1);
|
const page = ref<number>(1);
|
||||||
const pdfSrc = ref<any>();
|
const pdfSrc = ref<any>();
|
||||||
|
const splitterModel = ref<number>(14);
|
||||||
|
|
||||||
/** tree*/
|
/** tree*/
|
||||||
const filterTree = ref<string>("");
|
const filterTree = ref<string>("");
|
||||||
|
|
@ -594,6 +589,8 @@ onMounted(() => {
|
||||||
</div>
|
</div>
|
||||||
<div class="col-lg-9 col-md-9 col-sm-9 col-xs-12 col-xs-12 flex">
|
<div class="col-lg-9 col-md-9 col-sm-9 col-xs-12 col-xs-12 flex">
|
||||||
<q-splitter
|
<q-splitter
|
||||||
|
disable
|
||||||
|
v-model="splitterModel"
|
||||||
horizontal
|
horizontal
|
||||||
style="
|
style="
|
||||||
height: 75vh;
|
height: 75vh;
|
||||||
|
|
|
||||||
|
|
@ -294,6 +294,7 @@ onMounted(async () => {
|
||||||
</q-toolbar>
|
</q-toolbar>
|
||||||
<q-splitter
|
<q-splitter
|
||||||
v-model="splitterModel"
|
v-model="splitterModel"
|
||||||
|
disable
|
||||||
horizontal
|
horizontal
|
||||||
style="
|
style="
|
||||||
height: 70vh;
|
height: 70vh;
|
||||||
|
|
|
||||||
|
|
@ -636,6 +636,8 @@ onMounted(async () => {
|
||||||
</div>
|
</div>
|
||||||
<div class="col-lg-9 col-md-9 col-sm-9 col-xs-12 col-xs-12 flex">
|
<div class="col-lg-9 col-md-9 col-sm-9 col-xs-12 col-xs-12 flex">
|
||||||
<q-splitter
|
<q-splitter
|
||||||
|
disable
|
||||||
|
v-model="splitterModel"
|
||||||
horizontal
|
horizontal
|
||||||
style="
|
style="
|
||||||
height: 75vh;
|
height: 75vh;
|
||||||
|
|
|
||||||
|
|
@ -8,7 +8,6 @@ import { useRoute } from "vue-router";
|
||||||
import { checkPermission } from "@/utils/permissions";
|
import { checkPermission } from "@/utils/permissions";
|
||||||
import { useCounterMixin } from "@/stores/mixin";
|
import { useCounterMixin } from "@/stores/mixin";
|
||||||
import { useStructureTree } from "@/stores/structureTree";
|
import { useStructureTree } from "@/stores/structureTree";
|
||||||
import { useMenuDataStore } from "@/stores/menuList";
|
|
||||||
|
|
||||||
import genReportXLSX from "@/plugins/genreportxlsx";
|
import genReportXLSX from "@/plugins/genreportxlsx";
|
||||||
import http from "@/plugins/http";
|
import http from "@/plugins/http";
|
||||||
|
|
@ -20,7 +19,6 @@ import type {
|
||||||
} from "@/modules/09_leave/interface/index/Main";
|
} from "@/modules/09_leave/interface/index/Main";
|
||||||
|
|
||||||
import LoadView from "@/components/LoadView.vue";
|
import LoadView from "@/components/LoadView.vue";
|
||||||
import type { DataRoles } from "@/interface/response/main";
|
|
||||||
|
|
||||||
const expandedModal = ref<boolean>(false);
|
const expandedModal = ref<boolean>(false);
|
||||||
const org = ref<string>("");
|
const org = ref<string>("");
|
||||||
|
|
@ -30,7 +28,6 @@ const isLoadStructureTree = ref<boolean>(true);
|
||||||
/** use*/
|
/** use*/
|
||||||
const $q = useQuasar();
|
const $q = useQuasar();
|
||||||
const route = useRoute();
|
const route = useRoute();
|
||||||
const storeMenu = useMenuDataStore();
|
|
||||||
|
|
||||||
const { fetchStructureTree } = useStructureTree();
|
const { fetchStructureTree } = useStructureTree();
|
||||||
const { date2Thai, dateToISO, messageError, monthYear2Thai } =
|
const { date2Thai, dateToISO, messageError, monthYear2Thai } =
|
||||||
|
|
@ -114,6 +111,7 @@ const leaveTypeOptionOption = ref<DataOption[]>(leaveTypeOptionMain.value);
|
||||||
const detailReport = ref<any>();
|
const detailReport = ref<any>();
|
||||||
const isReport = ref<boolean>(false);
|
const isReport = ref<boolean>(false);
|
||||||
const isLoadPDF = ref<boolean>(false);
|
const isLoadPDF = ref<boolean>(false);
|
||||||
|
const splitterModel = ref<number>(14);
|
||||||
|
|
||||||
/** tree*/
|
/** tree*/
|
||||||
const filterTree = ref<string>("");
|
const filterTree = ref<string>("");
|
||||||
|
|
@ -942,6 +940,8 @@ onMounted(() => {
|
||||||
</div>
|
</div>
|
||||||
<div class="col-lg-9 col-md-9 col-sm-9 col-xs-12 col-xs-12 flex">
|
<div class="col-lg-9 col-md-9 col-sm-9 col-xs-12 col-xs-12 flex">
|
||||||
<q-splitter
|
<q-splitter
|
||||||
|
disable
|
||||||
|
v-model="splitterModel"
|
||||||
horizontal
|
horizontal
|
||||||
style="
|
style="
|
||||||
height: 75vh;
|
height: 75vh;
|
||||||
|
|
|
||||||
|
|
@ -220,6 +220,7 @@ onMounted(async () => {
|
||||||
</q-toolbar>
|
</q-toolbar>
|
||||||
<q-splitter
|
<q-splitter
|
||||||
v-model="splitterModel"
|
v-model="splitterModel"
|
||||||
|
disable
|
||||||
horizontal
|
horizontal
|
||||||
style="
|
style="
|
||||||
height: 70vh;
|
height: 70vh;
|
||||||
|
|
|
||||||
|
|
@ -6,7 +6,6 @@ import { VuePDF, usePDF } from "@tato30/vue-pdf";
|
||||||
import axios from "axios";
|
import axios from "axios";
|
||||||
import genReportXLSX from "@/plugins/genreportxlsx";
|
import genReportXLSX from "@/plugins/genreportxlsx";
|
||||||
|
|
||||||
|
|
||||||
import http from "@/plugins/http";
|
import http from "@/plugins/http";
|
||||||
import config from "@/app.config";
|
import config from "@/app.config";
|
||||||
import { checkPermission } from "@/utils/permissions";
|
import { checkPermission } from "@/utils/permissions";
|
||||||
|
|
@ -648,6 +647,8 @@ onMounted(async () => {
|
||||||
</div>
|
</div>
|
||||||
<div class="col-lg-9 col-md-9 col-sm-9 col-xs-12 col-xs-12 flex">
|
<div class="col-lg-9 col-md-9 col-sm-9 col-xs-12 col-xs-12 flex">
|
||||||
<q-splitter
|
<q-splitter
|
||||||
|
disable
|
||||||
|
v-model="splitterModel"
|
||||||
horizontal
|
horizontal
|
||||||
style="
|
style="
|
||||||
height: 75vh;
|
height: 75vh;
|
||||||
|
|
|
||||||
|
|
@ -9,7 +9,7 @@ import config from "@/app.config";
|
||||||
import type {
|
import type {
|
||||||
FormComment,
|
FormComment,
|
||||||
FormCommentByRole,
|
FormCommentByRole,
|
||||||
} from "@/modules/14_KPI/interface/request/Index";
|
} from "@/modules/14_KPI/interface/request/index";
|
||||||
import { useRoute } from "vue-router";
|
import { useRoute } from "vue-router";
|
||||||
import { useQuasar } from "quasar";
|
import { useQuasar } from "quasar";
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -774,6 +774,8 @@ onMounted(() => {
|
||||||
</div>
|
</div>
|
||||||
<div class="col-lg-9 col-md-9 col-sm-9 col-xs-12 col-xs-12 flex">
|
<div class="col-lg-9 col-md-9 col-sm-9 col-xs-12 col-xs-12 flex">
|
||||||
<q-splitter
|
<q-splitter
|
||||||
|
disable
|
||||||
|
v-model="splitterModel"
|
||||||
horizontal
|
horizontal
|
||||||
style="
|
style="
|
||||||
height: 75vh;
|
height: 75vh;
|
||||||
|
|
|
||||||
|
|
@ -97,7 +97,7 @@ onMounted(async () => {
|
||||||
<q-card bordered>
|
<q-card bordered>
|
||||||
<div class="col-12 text-weight-medium bg-grey-1 q-py-xs q-px-md">
|
<div class="col-12 text-weight-medium bg-grey-1 q-py-xs q-px-md">
|
||||||
สถานะของคำสั่ง
|
สถานะของคำสั่ง
|
||||||
<spen v-if="isStatus === 'CANCEL'" class="text-red"> (ลบ) </spen>
|
<span v-if="isStatus === 'CANCEL'" class="text-red"> (ลบ) </span>
|
||||||
</div>
|
</div>
|
||||||
<q-separator />
|
<q-separator />
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -162,7 +162,6 @@ onMounted(async () => {
|
||||||
</q-tab-panel>
|
</q-tab-panel>
|
||||||
<q-tab-panel class="bg-grey-2" style="padding: 0px" name="ListPersons">
|
<q-tab-panel class="bg-grey-2" style="padding: 0px" name="ListPersons">
|
||||||
<ListPersons
|
<ListPersons
|
||||||
v-model:is-change-data="isChangeData"
|
|
||||||
:on-check-change-data="onCheckChangeData"
|
:on-check-change-data="onCheckChangeData"
|
||||||
:fetch-data-command-list="fetchDataCommandList"
|
:fetch-data-command-list="fetchDataCommandList"
|
||||||
:command-sys-id="formCommandList?.commandSysId as string"
|
:command-sys-id="formCommandList?.commandSysId as string"
|
||||||
|
|
@ -183,9 +182,7 @@ onMounted(async () => {
|
||||||
<q-tab-panel style="padding: 0px" name="Attached">
|
<q-tab-panel style="padding: 0px" name="Attached">
|
||||||
<q-card>
|
<q-card>
|
||||||
<Attached
|
<Attached
|
||||||
v-model:is-change-data="isChangeData"
|
|
||||||
v-model:is-attachment="formCommandList.isAttachment"
|
v-model:is-attachment="formCommandList.isAttachment"
|
||||||
:on-check-change-data="onCheckChangeData"
|
|
||||||
:form-command-list="formCommandList"
|
:form-command-list="formCommandList"
|
||||||
/>
|
/>
|
||||||
</q-card>
|
</q-card>
|
||||||
|
|
|
||||||
|
|
@ -25,6 +25,7 @@ const { hideLoader, messageError } = useCounterMixin();
|
||||||
const numOfPages = ref<number>(0);
|
const numOfPages = ref<number>(0);
|
||||||
const page = ref<number>(1);
|
const page = ref<number>(1);
|
||||||
const pdfSrc = ref<any>();
|
const pdfSrc = ref<any>();
|
||||||
|
const splitterModel = ref(14);
|
||||||
|
|
||||||
/** prosp*/
|
/** prosp*/
|
||||||
const isLoadPDF = ref<boolean>(false);
|
const isLoadPDF = ref<boolean>(false);
|
||||||
|
|
@ -225,6 +226,8 @@ watch(
|
||||||
<div class="col-12">
|
<div class="col-12">
|
||||||
<q-card>
|
<q-card>
|
||||||
<q-splitter
|
<q-splitter
|
||||||
|
disable
|
||||||
|
v-model="splitterModel"
|
||||||
horizontal
|
horizontal
|
||||||
style="
|
style="
|
||||||
height: 65vh;
|
height: 65vh;
|
||||||
|
|
|
||||||
|
|
@ -420,6 +420,8 @@ onMounted(async () => {
|
||||||
</div>
|
</div>
|
||||||
<div class="col-lg-9 col-md-9 col-sm-9 col-xs-12 col-xs-12 flex">
|
<div class="col-lg-9 col-md-9 col-sm-9 col-xs-12 col-xs-12 flex">
|
||||||
<q-splitter
|
<q-splitter
|
||||||
|
v-model="splitterModel"
|
||||||
|
disable
|
||||||
horizontal
|
horizontal
|
||||||
style="
|
style="
|
||||||
height: 75vh;
|
height: 75vh;
|
||||||
|
|
|
||||||
|
|
@ -21,8 +21,6 @@ const { fetchStructureTree } = useStructureTree();
|
||||||
const { messageError } = useCounterMixin();
|
const { messageError } = useCounterMixin();
|
||||||
|
|
||||||
const loadingBtn = ref<boolean>(false);
|
const loadingBtn = ref<boolean>(false);
|
||||||
const isReport = ref<boolean>(false);
|
|
||||||
const isLoadPDF = ref<boolean>(false);
|
|
||||||
const expandedModal = ref<boolean>(false);
|
const expandedModal = ref<boolean>(false);
|
||||||
const org = ref<string>("");
|
const org = ref<string>("");
|
||||||
|
|
||||||
|
|
@ -39,6 +37,7 @@ const detailReport = ref<any>();
|
||||||
const numOfPages = ref<number>(0);
|
const numOfPages = ref<number>(0);
|
||||||
const page = ref<number>(1);
|
const page = ref<number>(1);
|
||||||
const pdfSrc = ref<any>();
|
const pdfSrc = ref<any>();
|
||||||
|
const splitterModel = ref(14);
|
||||||
|
|
||||||
/** ฟังก์ชันเรียกข้อมูลโครงสร้างหน่วยงาน*/
|
/** ฟังก์ชันเรียกข้อมูลโครงสร้างหน่วยงาน*/
|
||||||
async function fetchDataTree() {
|
async function fetchDataTree() {
|
||||||
|
|
@ -368,6 +367,8 @@ onMounted(() => {
|
||||||
</div>
|
</div>
|
||||||
<div class="col-lg-9 col-md-9 col-sm-9 col-xs-12 col-xs-12 flex">
|
<div class="col-lg-9 col-md-9 col-sm-9 col-xs-12 col-xs-12 flex">
|
||||||
<q-splitter
|
<q-splitter
|
||||||
|
v-model="splitterModel"
|
||||||
|
disable
|
||||||
horizontal
|
horizontal
|
||||||
style="
|
style="
|
||||||
height: 75vh;
|
height: 75vh;
|
||||||
|
|
|
||||||
|
|
@ -69,6 +69,7 @@ const nodeName = ref<string>("");
|
||||||
const node = ref<DataStructureTree[]>([]);
|
const node = ref<DataStructureTree[]>([]);
|
||||||
|
|
||||||
const detailReport = ref<any>();
|
const detailReport = ref<any>();
|
||||||
|
const splitterModel = ref(14);
|
||||||
|
|
||||||
/** ฟังก์ชันเรียกข้อมูลรอบการขึ้นเงินเดือน*/
|
/** ฟังก์ชันเรียกข้อมูลรอบการขึ้นเงินเดือน*/
|
||||||
async function fetchDataRound() {
|
async function fetchDataRound() {
|
||||||
|
|
@ -590,6 +591,8 @@ onMounted(() => {
|
||||||
</div>
|
</div>
|
||||||
<div class="col-lg-9 col-md-9 col-sm-9 col-xs-12 col-xs-12 flex">
|
<div class="col-lg-9 col-md-9 col-sm-9 col-xs-12 col-xs-12 flex">
|
||||||
<q-splitter
|
<q-splitter
|
||||||
|
v-model="splitterModel"
|
||||||
|
disable
|
||||||
horizontal
|
horizontal
|
||||||
style="
|
style="
|
||||||
height: 75vh;
|
height: 75vh;
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue