diff --git a/package-lock.json b/package-lock.json index b484a00e6..e0da68418 100644 --- a/package-lock.json +++ b/package-lock.json @@ -25,6 +25,7 @@ "quasar": "^2.11.1", "structure-chart": "^0.0.9", "vue": "^3.2.45", + "vue-currency-input": "^3.0.5", "vue-router": "^4.1.6", "vue3-datepicker": "^0.3.4", "vue3-pdfjs": "^0.1.6" @@ -3952,20 +3953,6 @@ "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==", "devOptional": true }, - "node_modules/fsevents": { - "version": "2.3.2", - "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz", - "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==", - "dev": true, - "hasInstallScript": true, - "optional": true, - "os": [ - "darwin" - ], - "engines": { - "node": "^8.16.0 || ^10.6.0 || >=11.0.0" - } - }, "node_modules/function-bind": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz", @@ -7722,7 +7709,7 @@ }, "node_modules/vue": { "version": "3.2.47", - // "resolved": "https://npm.joolsoft.com/vue/-/vue-3.2.47.tgz", + "resolved": "https://npm.joolsoft.com/vue/-/vue-3.2.47.tgz", "integrity": "sha512-60188y/9Dc9WVrAZeUVSDxRQOZ+z+y5nO2ts9jWXSTkMvayiWxCWOWtBQoYjLeccfXkiiPZWAHcV+WTPhkqJHQ==", "dependencies": { "@vue/compiler-dom": "3.2.47", @@ -7732,6 +7719,14 @@ "@vue/shared": "3.2.47" } }, + "node_modules/vue-currency-input": { + "version": "3.0.5", + "resolved": "https://registry.npmjs.org/vue-currency-input/-/vue-currency-input-3.0.5.tgz", + "integrity": "sha512-HG1hKvAvUDt/mklm+2nEEOuvMNxXVd+O2v2PPOia0iNAs4a7B0fWEsHSoca60Ah9EA4nR0Do5UQUkR5Wqhcb/g==", + "peerDependencies": { + "vue": "^2.7 || ^3.0.0" + } + }, "node_modules/vue-eslint-parser": { "version": "9.1.0", "resolved": "https://registry.npmjs.org/vue-eslint-parser/-/vue-eslint-parser-9.1.0.tgz", @@ -11086,13 +11081,6 @@ "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==", "devOptional": true }, - "fsevents": { - "version": "2.3.2", - "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz", - "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==", - "dev": true, - "optional": true - }, "function-bind": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz", @@ -13787,7 +13775,7 @@ }, "vue": { "version": "3.2.47", - // "resolved": "https://npm.joolsoft.com/vue/-/vue-3.2.47.tgz", + "resolved": "https://npm.joolsoft.com/vue/-/vue-3.2.47.tgz", "integrity": "sha512-60188y/9Dc9WVrAZeUVSDxRQOZ+z+y5nO2ts9jWXSTkMvayiWxCWOWtBQoYjLeccfXkiiPZWAHcV+WTPhkqJHQ==", "requires": { "@vue/compiler-dom": "3.2.47", @@ -13797,6 +13785,12 @@ "@vue/shared": "3.2.47" } }, + "vue-currency-input": { + "version": "3.0.5", + "resolved": "https://registry.npmjs.org/vue-currency-input/-/vue-currency-input-3.0.5.tgz", + "integrity": "sha512-HG1hKvAvUDt/mklm+2nEEOuvMNxXVd+O2v2PPOia0iNAs4a7B0fWEsHSoca60Ah9EA4nR0Do5UQUkR5Wqhcb/g==", + "requires": {} + }, "vue-eslint-parser": { "version": "9.1.0", "resolved": "https://registry.npmjs.org/vue-eslint-parser/-/vue-eslint-parser-9.1.0.tgz", diff --git a/src/components/CurruncyInput.vue b/src/components/CurruncyInput.vue new file mode 100644 index 000000000..5dcdcc7ac --- /dev/null +++ b/src/components/CurruncyInput.vue @@ -0,0 +1,62 @@ + + + diff --git a/src/modules/05_placement/components/Receive/receiveDetail2.vue b/src/modules/05_placement/components/Receive/receiveDetail2.vue index 8cf1eadc1..8f3b77a44 100644 --- a/src/modules/05_placement/components/Receive/receiveDetail2.vue +++ b/src/modules/05_placement/components/Receive/receiveDetail2.vue @@ -574,6 +574,7 @@ import { useQuasar } from "quasar"; import { useRoute, useRouter } from "vue-router"; import { useCounterMixin } from "@/stores/mixin"; import { useProfileDataStore } from "@/modules/08_registryEmployee/store"; +import CurruncyInput from "@/components/CurruncyInput.vue"; import type { QTableProps, QForm } from "quasar"; import type { ResponseTitle } from "@/modules/05_placement/interface/response/Receive"; @@ -615,6 +616,8 @@ const title = ref({ positionTypeOld: "", }); +const value = ref(123554); + const myForm = ref(null); const edit = ref(false); diff --git a/src/views/MainLayout.vue b/src/views/MainLayout.vue index d0b672c84..3349e53d0 100644 --- a/src/views/MainLayout.vue +++ b/src/views/MainLayout.vue @@ -79,34 +79,34 @@ const options = ref([ }, ]); -// const getDataNotification = async () => { -// showLoader(); -// await http -// .get(config.API.msgNotificate) -// .then((res: any) => { -// const response = res.data.result; -// // console.log("response", response); -// let list: notiType[] = []; -// response.map((e: any) => { -// list.push({ -// id: e.id, -// sender: -// e.createdFullName == "" || e.createdFullName == null -// ? "เจ้าหน้าที่"[0] -// : e.createdFullName[0], -// body: e.body ?? "", -// timereceive: new Date(e.createdAt), -// }); -// }); -// notiList.value = list; -// }) -// .catch((e) => { -// // messageError($q, e); -// }) -// .finally(() => { -// hideLoader(); -// }); -// }; +const getDataNotification = async () => { + showLoader(); + await http + .get(config.API.msgNotificate) + .then((res: any) => { + const response = res.data.result; + // console.log("response", response); + let list: notiType[] = []; + response.map((e: any) => { + list.push({ + id: e.id, + sender: + e.createdFullName == "" || e.createdFullName == null + ? "เจ้าหน้าที่"[0] + : e.createdFullName[0], + body: e.body ?? "", + timereceive: new Date(e.createdAt), + }); + }); + notiList.value = list; + }) + .catch((e) => { + // messageError($q, e); + }) + .finally(() => { + hideLoader(); + }); +}; /** * ให้แสดง แทปด้านขวา เมื่อเข้าหน้า รายละเอียดทะเบียนประวัติ @@ -211,7 +211,7 @@ const activeBtn = () => { * ยังจับ boolean ผิด จึงต้อง set */ onMounted(async () => { - await getDataNotification(); + // await getDataNotification(); myEventHandler(null, false); window.addEventListener("resize", (e: any) => { myEventHandler(e, true);