hrms-bangkok/hrms-mgt
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Merge branch 'develop' into dev

Browse source
This commit is contained in:
DESKTOP-1R2VSQH\Lenovo ThinkPad E490 2026-04-24 14:51:47 +07:00
commit c3dc4ce774
2 changed files with 12 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

17
src/modules/04_registryPerson/views/edit/components/DialogExcelPreview.vue
View file

@ -1,11 +1,16 @@
<script setup lang="ts"> <script setup lang="ts">
import { ref, computed, watch } from "vue"; import { ref, computed, watch } from "vue";
import { useQuasar } from "quasar";
import moment from "moment"; import moment from "moment";
import { import {
parseExcelFile, parseExcelFile,
formatFileSize, formatFileSize,
type ExcelPreviewData,
} from "@/modules/04_registryPerson/utils/excelParser"; } from "@/modules/04_registryPerson/utils/excelParser";
import { useCounterMixin } from "@/stores/mixin";
const $q = useQuasar();
const { dialogConfirm } = useCounterMixin();
interface Props { interface Props {
modal: boolean; modal: boolean;
@ -157,10 +162,12 @@ async function loadPreview() {
} }
function onConfirm() { function onConfirm() {
if (props.file) { dialogConfirm($q, () => {
isUploading.value = true; if (props.file) {
emit("confirm", props.file); isUploading.value = true;
} emit("confirm", props.file);
}
});
} }
function onClose() { function onClose() {

1
src/modules/04_registryPerson/views/edit/components/Table.vue
View file

@ -1,7 +1,6 @@
<script setup lang="ts"> <script setup lang="ts">
import { ref, onMounted, computed, reactive } from "vue"; import { ref, onMounted, computed, reactive } from "vue";
import { useQuasar } from "quasar"; import { useQuasar } from "quasar";
import * as XLSX from "xlsx";
import http from "@/plugins/http"; import http from "@/plugins/http";
import config from "@/app.config"; import config from "@/app.config";