From 7bc057d02df06401592c61b75cba97efac528768 Mon Sep 17 00:00:00 2001 From: kamoa457 Date: Fri, 3 Nov 2023 02:06:40 +0700 Subject: [PATCH] update all UI --- src/assets/dataJson/masterData.json | 72 ++- src/assets/dataJson/rooms.json | 13 + src/assets/img/accounting.png | Bin 0 -> 28376 bytes src/main.js | 2 +- src/router/index.js | 6 + src/views/Expenses/ExpensesView.vue | 503 ++++++++++++++++++ .../Sections/PresentationInformation.vue | 17 +- src/views/Queue/QueueView.vue | 84 +-- src/views/Reports/ReportlistView.vue | 231 ++++---- src/views/Restroom/AddRoom.vue | 49 ++ src/views/Restroom/DetailRoomPage.vue | 131 +++-- src/views/Restroom/RoomView.vue | 75 ++- src/views/Restroom/UpdateRoom.vue | 65 +-- src/views/RoomLayout/RoomLayoutView.vue | 51 +- src/views/SearchAll/SearchView.vue | 12 +- src/views/Users/UserlistView.vue | 191 ++++--- src/views/UtilitiesRoom/UtilitieView.vue | 12 +- 17 files changed, 1122 insertions(+), 392 deletions(-) create mode 100644 src/assets/img/accounting.png create mode 100644 src/views/Expenses/ExpensesView.vue diff --git a/src/assets/dataJson/masterData.json b/src/assets/dataJson/masterData.json index 16a5401..a17f99e 100644 --- a/src/assets/dataJson/masterData.json +++ b/src/assets/dataJson/masterData.json @@ -1,5 +1,17 @@ { "ranks": [ + { + "label": "นาย", + "value": "นาย" + }, + { + "label": "นาง", + "value": "นาง" + }, + { + "label": "นางสาว", + "value": "นางสาว" + }, { "label": "ส.ต.ต.", "value": "ส.ต.ต." @@ -102,6 +114,7 @@ } ], "position": [ + { "label": "รอง สว.", "value": "รอง สว." @@ -140,6 +153,10 @@ } ], "Affiliation": [ + { + "label": "ลูกจ้าง", + "value": "ลูกจ้าง" + }, { "label": "บช.ตซด.", "value": "บช.ตซด." @@ -211,6 +228,7 @@ "name": "อาคารแฟลต 1/11", "room": "24", "floor": "4", + "roomnumber": "12,13", "type": "ช.2" }, { @@ -218,6 +236,7 @@ "name": "อาคารแฟลต 1/12", "room": "20", "floor": "4", + "roomnumber": "12,13", "type": "ช.2" }, { @@ -225,6 +244,7 @@ "name": "อาคารแฟลต 1/13", "room": "24", "floor": "4", + "roomnumber": "12,13", "type": "ช.2" }, { @@ -232,6 +252,7 @@ "name": "อาคารแฟลต 1/14", "room": "18", "floor": "3", + "roomnumber": "12,13", "type": "ช.3" }, { @@ -239,6 +260,7 @@ "name": "อาคารแฟลต 1/15", "room": "32", "floor": "4", + "roomnumber": "12,13", "type": "ช.2" }, { @@ -246,6 +268,7 @@ "name": "อาคารแฟลต 1/16", "room": "24", "floor": "4", + "roomnumber": "12,13", "type": "ช.2" }, { @@ -253,6 +276,7 @@ "name": "อาคารแฟลต 1/17", "room": "32", "floor": "4", + "roomnumber": "12,13", "type": "ช.2" }, { @@ -260,6 +284,7 @@ "name": "อาคารแฟลต 1/18", "room": "60", "floor": "5", + "roomnumber": "12,13", "type": "-" }, { @@ -267,6 +292,7 @@ "name": "แฟลตลือชา 1", "room": "50", "floor": "5", + "roomnumber": "12,13", "type": "-" }, { @@ -274,6 +300,7 @@ "name": "แฟลตลือชา 2", "room": "50", "floor": "5", + "roomnumber": "12,13", "type": "-" }, { @@ -281,6 +308,7 @@ "name": "แฟลตลือชา 3", "room": "40", "floor": "5", + "roomnumber": "12,13", "type": "ช.2" }, { @@ -288,6 +316,7 @@ "name": "แฟลตบางเขน 1", "room": "50", "floor": "5", + "roomnumber": "12,13", "type": "-" }, { @@ -295,49 +324,8 @@ "name": "แฟลตบางเขน 2", "room": "50", "floor": "5", + "roomnumber": "12,13", "type": "ช.2" - }, - { - "buil": "อาคารบ้านพักส่วนกลาง", - "name": "ลือชา ตร.", - "room": "-", - "floor": "-", - "type": "-" - }, - { - "buil": "อาคารบ้านพักส่วนกลาง", - "name": "ทุ่งสองห้อง", - "room": "-", - "floor": "-", - "type": "-" - }, - { - "buil": "อาคารบ้านพักส่วนกลาง", - "name": "วิภาวดี", - "room": "-", - "floor": "-", - "type": "-" - }, - { - "buil": "อาคารบ้านพักส่วนกลาง", - "name": "ถนอมมิตร", - "room": "-", - "floor": "-", - "type": "-" - }, - { - "buil": "อาคารบ้านพักส่วนกลาง", - "name": "อุดมสุข", - "room": "-", - "floor": "-", - "type": "-" - }, - { - "buil": "อาคารบ้านพักส่วนกลาง", - "name": "เฉลิมลาภ", - "room": "-", - "floor": "-", - "type": "-" } ] } \ No newline at end of file diff --git a/src/assets/dataJson/rooms.json b/src/assets/dataJson/rooms.json index 0332188..30d3204 100644 --- a/src/assets/dataJson/rooms.json +++ b/src/assets/dataJson/rooms.json @@ -2,6 +2,7 @@ { "title": "ห้อง 1", "dataIndex": "1", + "ranks": "", "firstName": "", "laststName": "", "Affiliation": "", @@ -10,6 +11,7 @@ { "title": "ห้อง 2", "dataIndex": "2", + "ranks": "ส.ต.ต.", "firstName": "ปิติ2", "laststName": "มีดี", "Affiliation": "ฝอ. 2", @@ -18,6 +20,7 @@ { "title": "ห้อง 3", "dataIndex": "3", + "ranks": "", "firstName": "", "laststName": "", "Affiliation": "", @@ -26,6 +29,7 @@ { "title": "ห้อง 4", "dataIndex": "4", + "ranks": "ส.ต.ต.", "firstName": "ปิติ2", "laststName": "มีดี", "Affiliation": "ฝอ. 1", @@ -34,6 +38,7 @@ { "title": "ห้อง 5", "dataIndex": "5", + "ranks": "ส.ต.ต.", "firstName": "ปิติ3", "laststName": "มีดี", "Affiliation": "ฝอ. 1", @@ -42,6 +47,7 @@ { "title": "ห้อง 6", "dataIndex": "6", + "ranks": "ส.ต.ต.", "firstName": "ปิติ4", "laststName": "มีดี", "Affiliation": "ฝอ. 1", @@ -50,6 +56,7 @@ { "title": "ห้อง 7", "dataIndex": "7", + "ranks": "ส.ต.ต.", "firstName": "ปิติ3", "laststName": "มีดี", "Affiliation": "ฝอ. 1", @@ -58,6 +65,7 @@ { "title": "ห้อง 8", "dataIndex": "8", + "ranks": "ส.ต.ต.", "firstName": "ปิติ9", "laststName": "มีดี", "Affiliation": "ฝอ. 1", @@ -66,6 +74,7 @@ { "title": "ห้อง 9", "dataIndex": "9", + "ranks": "ส.ต.ต.", "firstName": "ปิติ5", "laststName": "มีดี", "Affiliation": "ฝอ. 4", @@ -74,6 +83,7 @@ { "title": "ห้อง 10", "dataIndex": "10", + "ranks": "ส.ต.ต.", "firstName": "ปิติ6", "laststName": "มีดี", "Affiliation": "ฝอ. 7", @@ -82,6 +92,7 @@ { "title": "ห้อง 11", "dataIndex": "11", + "ranks": "", "firstName": "", "laststName": "", "Affiliation": "", @@ -90,6 +101,7 @@ { "title": "ห้อง 12", "dataIndex": "12", + "ranks": "", "firstName": "", "laststName": "", "Affiliation": "", @@ -98,6 +110,7 @@ { "title": "ห้อง 13", "dataIndex": "13", + "ranks": "ส.ต.ต.", "firstName": "ปิติ7", "laststName": "มีดี", "Affiliation": "ฝอ. 2", diff --git a/src/assets/img/accounting.png b/src/assets/img/accounting.png new file mode 100644 index 0000000000000000000000000000000000000000..0a3444dab1774dc8c3c60c9a8229f615646be08f GIT binary patch literal 28376 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 literal 0 HcmV?d00001 diff --git a/src/main.js b/src/main.js index 43e6b41..3d5162d 100644 --- a/src/main.js +++ b/src/main.js @@ -2,7 +2,7 @@ import { createApp } from "vue"; import { createPinia } from "pinia"; import App from "./App.vue"; import router from "./router"; -import '@trevoreyre/autocomplete-vue/dist/style.css' +// import '@trevoreyre/autocomplete-vue/dist/style.css' // Nucleo Icons import "./assets/css/nucleo-icons.css"; diff --git a/src/router/index.js b/src/router/index.js index d325f63..a26232f 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -33,6 +33,7 @@ import addUserRoom from "../views/Restroom/AddRoom.vue" import Reports from "../views/Reports/ReportlistView.vue" import searchFilter from "../views/SearchAll/SearchView.vue" import Queue from "../views/Queue/QueueView.vue" +import Expenses from "../views/Expenses/ExpensesView.vue" const router = createRouter({ history: createWebHistory(import.meta.env.BASE_URL), routes: [ @@ -76,6 +77,11 @@ const router = createRouter({ name: "searchfilter", component: searchFilter, }, + { + path: "/expenses", + name: "expenses", + component: Expenses, + }, { path: "/queue", name: "queue", diff --git a/src/views/Expenses/ExpensesView.vue b/src/views/Expenses/ExpensesView.vue new file mode 100644 index 0000000..d02e7ca --- /dev/null +++ b/src/views/Expenses/ExpensesView.vue @@ -0,0 +1,503 @@ + + + diff --git a/src/views/Presentation/Sections/PresentationInformation.vue b/src/views/Presentation/Sections/PresentationInformation.vue index 6193eef..c9614ef 100644 --- a/src/views/Presentation/Sections/PresentationInformation.vue +++ b/src/views/Presentation/Sections/PresentationInformation.vue @@ -38,7 +38,7 @@ -
+ +

ระบบคิว

@@ -71,6 +71,17 @@
+
+
+
+

บันทึกค่าใช้จ่ายรายเดือน ตร

+ title + + บันทึกค่าใช้จ่ายรายเดือน ตร + +
+
+
diff --git a/src/views/Queue/QueueView.vue b/src/views/Queue/QueueView.vue index b8a13cc..4d50d26 100644 --- a/src/views/Queue/QueueView.vue +++ b/src/views/Queue/QueueView.vue @@ -32,6 +32,7 @@ const userlist = [ Affiliation: "ฝอ.2", //สังกัด rank: "ส.ต.ต.", //ยศ old: "32", + status: "สมรส", birthday: "04/03/2534", idcard: "134044411441122", phone: "0325647846", @@ -43,6 +44,7 @@ const userlist = [ Affiliation: "ฝอ.2", //สังกัด rank: "ส.ต.ต.", //ยศ old: "32", + status: "โสด", birthday: "14/07/2534", idcard: "134044411441178", phone: "0325647845", @@ -131,39 +133,62 @@ export default {
-
- -
-
- - + - เพิ่มผู้เช่าลงคิว +
+
+
+
+ + + +
+
+ + +
+
+
+ + + เพิ่มผู้เช่าลงคิว +
- - - - + + - + @@ -171,15 +196,11 @@ export default { - - - - + - + -
ลำดับชื่อสกุลวันเกิดอายุชื่อ-สกุล สังกัดยศสถานภาพ เลขบัตรประชาชน เบอร์ติดต่อ
{{ index + 1 }}{{ item.firstName }}{{ item.lastName }}{{ item.birthday }}{{ item.old }}{{ item.rank }} {{ item.firstName }} {{ item.lastName }} {{ item.Affiliation }}{{ item.rank }}{{ item.status }} {{ item.idcard }} {{ item.phone }}
@@ -254,7 +275,6 @@ export default { .bg-special { border: 2px solid #edc7c7 !important; color: #000; - } input::-webkit-outer-spin-button, input::-webkit-inner-spin-button { diff --git a/src/views/Reports/ReportlistView.vue b/src/views/Reports/ReportlistView.vue index d1d8f21..ceca51b 100644 --- a/src/views/Reports/ReportlistView.vue +++ b/src/views/Reports/ReportlistView.vue @@ -3,6 +3,7 @@ import MaterialInput from "@/components/MaterialInput.vue"; import MaterialButton from "@/components/MaterialButton.vue"; import Breadcrumbs from "@/examples/Breadcrumbs.vue"; import vueMkHeader from "@/assets/img/bg.jpg"; +import masterData from "@/assets/dataJson/masterData.json"; const listRoom = [ { title: "ตึก 1" }, @@ -61,6 +62,7 @@ export default { NoRoom, userlist, vueMkHeader, + masterData, }; }, @@ -74,6 +76,26 @@ export default { { label: "Laravel", value: "PHP" }, { label: "Phoenix", value: "Elixir" }, ], + optionYear:[ + { label: "2023", value: "2023" }, + { label: "2022", value: "2022" }, + { label: "2021", value: "2021" }, + { label: "2020", value: "2020" } + ], + optionMonth:[ + { label: "มกราคม", value: "มกราคม" }, + { label: "กุมภาพันธ์", value: "กุมภาพันธ์" }, + { label: "มีนาคม", value: "มีนาคม" }, + { label: "เมษายน", value: "เมษายน" }, + { label: "พฤษภาคม", value: "พฤษภาคม" }, + { label: "มิถุนายน", value: "มิถุนายน" }, + { label: "กรกฎาคม", value: "กรกฎาคม" }, + { label: "สิงหาคม", value: "สิงหาคม" }, + { label: "กันยายน", value: "กันยายน" }, + { label: "ตุลาคม", value: "ตุลาคม" }, + { label: "พฤศจิกายน", value: "พฤศจิกายน" }, + { label: "ธันวาคม", value: "ธันวาคม" }, + ], selectedColor: "", firstName: "", lastName: "", @@ -81,6 +103,10 @@ export default { rank: "", //ยศ idcard: "", phone: "", + selectedAffiliation: "ฝอ.2", + selectedYear:"2023", + selectedMonth:"พฤศจิกายน" + }; }, watch: { @@ -193,8 +219,10 @@ export default { aria-labelledby="home-tab" >
-
-
ประจำเดือน ตุลาคม
+
+
ประจำเดือน พฤศจิกายน
+
+
รวมค่าใช้จ่ายทั้งหมด : 18,111
- +
+
+ + +
+
+ + +
+
+ + +
+
@@ -234,7 +284,6 @@ export default { - @@ -253,8 +302,7 @@ export default { - - + @@ -268,8 +316,7 @@ export default { - - + @@ -289,8 +336,10 @@ export default { aria-labelledby="profile-tab" >
-
-
ประจำเดือน ตุลาคม
+
+
ประจำเดือน พฤศจิกายน
+
+
รวมค่าใช้จ่ายทั้งหมด : 18,111
- + - + - + diff --git a/src/views/Restroom/AddRoom.vue b/src/views/Restroom/AddRoom.vue index 7dd0b4c..efe5b87 100644 --- a/src/views/Restroom/AddRoom.vue +++ b/src/views/Restroom/AddRoom.vue @@ -30,6 +30,55 @@ const NoRoom = [ { title: "ชั้น 7" }, ]; + // { + // "buil": "อาคารบ้านพักส่วนกลาง", + // "name": "ลือชา ตร.", + // "room": "-", + // "floor": "-", + // "roomnumber": "-", + // "type": "-" + // }, + // { + // "buil": "อาคารบ้านพักส่วนกลาง", + // "name": "ทุ่งสองห้อง", + // "room": "-", + // "floor": "-", + // "roomnumber": "-", + // "type": "-" + // }, + // { + // "buil": "อาคารบ้านพักส่วนกลาง", + // "name": "วิภาวดี", + // "room": "-", + // "floor": "-", + // "roomnumber": "-", + // "type": "-" + // }, + // { + // "buil": "อาคารบ้านพักส่วนกลาง", + // "name": "ถนอมมิตร", + // "room": "-", + // "floor": "-", + // "roomnumber": "-", + // "type": "-" + // }, + // { + // "buil": "อาคารบ้านพักส่วนกลาง", + // "name": "อุดมสุข", + // "room": "-", + // "floor": "-", + // "roomnumber": "-", + // "type": "-" + // }, + // { + // "buil": "อาคารบ้านพักส่วนกลาง", + // "name": "เฉลิมลาภ", + // "room": "-", + // "floor": "-", + // "roomnumber": "-", + // "type": "-" + // } + const userlist = [ { dataIndex: "1", diff --git a/src/views/Restroom/DetailRoomPage.vue b/src/views/Restroom/DetailRoomPage.vue index c624b6c..e53f1e8 100644 --- a/src/views/Restroom/DetailRoomPage.vue +++ b/src/views/Restroom/DetailRoomPage.vue @@ -14,6 +14,7 @@ const userlist = [ rank: "ส.ต.ต.", idcard: "134044411441122", phone: "0325647846", + bookNumber: "1234", ContractDate: "12/11/2566", //สังกัด Lengthofstay: "3 เดือน", //ยศ InsuranceMoney: "10,000", @@ -27,6 +28,7 @@ const userlist = [ rank: "ส.ต.ต.", idcard: "134044411441178", phone: "0325647845", + bookNumber: "1234", ContractDate: "12/11/2566", //สังกัด Lengthofstay: "3 เดือน", //ยศ InsuranceMoney: "10,000", @@ -68,6 +70,7 @@ export default { old: "", birthday: "", installments: "", + booknumber:"" }; }, created() { @@ -75,16 +78,15 @@ export default { if (this.$route.params.id) { this.id = this.$route.params.id; } - this.mode == "add" ? (this.statusedit = false) : (this.statusedit = true); // this.$route.query }, methods: { gotoAction() { - if (this.mode == "edit") { - this.$router.push({ path: `/room/update/${this.id}` }); - } else { - this.$router.push({ path: `/addUserRoom` }); - } + // if (this.mode == "edit") { + this.$router.push({ path: `/room/update/${this.id}`, query: { mode: this.mode } }); + // } else { + // this.$router.push({ path: `/addUserRoom` , query: { mode: this.mode } }); + // } }, }, }; @@ -121,18 +123,10 @@ export default {

รายละเอียดห้องพัก 101

-
+
จัดการห้องพัก -
@@ -140,30 +134,31 @@ export default {
-
+
รายละเอียดผู้เช่า
-

ชือ : มานะ

+

ชือ : ส.ต.ต. มานะ

สถานะห้อง : ไม่ว่าง

-

ยศ : ส.ต.ต.

-

วันเกิด : 12/02/2514

+

สังกัด : ฝอ. 1

+

เลขบัตรประชาชน : 123456123456

วันทำสัญญา : 12/02/2564

-

อายุ : 33 ปี

+

ระยะเวลาที่เข้าพัก : 3 เดือน

นามสกุล : ถือดี

-

สังกัด : ฝอ. 1

-

เลขบัตรประชาชน : 123456123456

เบอร์โทร : 0972534887

เงินค่าประกัน : 12,000

+

งวดค่าประกัน : 5/10

+

จำนวนงวดค่าประกัน : 2,000

+

ยอดคงเหลือค่าประกัน : 6,000

-
+
รายละเอียดห้องพัก

ประเภทห้องพัก : ช๓

-

มิเตอร์น้ำ/ไฟ : 745/546

+

สภาพห้อง : ปกติ

@@ -186,24 +181,25 @@ export default {
- - + - + + - - + - + + +
อาคาร ชั้น เลขที่ห้องยศ ชื่อ-สกุล เลขก่อน เลขหลังแฟลตลือชา 2 3 303ส.ต.ต.มีนา บานเย็นส.ต.ต. มีนา บานเย็น 325 365 200แฟลตลือชา 2 3 303ส.ต.ต.มีนา บานเย็นส.ต.ต. มีนา บานเย็น 325 365 200
1ตุลาคมพฤศจิกายน อาคารบ้านพัก บช. ตชด. - -
- บันทึก - title -
- - -
- บันทึก - title -
- + +
+ บันทึก + title +
+ + +
+ บันทึก + title +
+
1ตุลาคมพฤศจิกายน อาคารบ้านพักส่วนกลาง - -
- บันทึก - title -
- - -
- บันทึก - title -
- + +
+ บันทึก + title +
+ + +
+ บันทึก + title +
+
1ตุลาคมพฤศจิกายน อาคารบ้านพัก ตร. - -
- บันทึก - title -
- - -
- บันทึก - title -
- + +
+ บันทึก + title +
+ + +
+ บันทึก + title +
+
ลำดับชื่อสกุลชื่อ-สกุล สังกัดยศ เลขบัตรประชาชน เบอร์ติดต่อเลขลงรับหนังสือ
{{ index + 1 }}{{ item.firstName }}{{ item.lastName }} + {{ item.rank }} {{ item.firstName }} {{ item.lastName }} + {{ item.Affiliation }}{{ item.rank }} {{ item.idcard }} {{ item.phone }}{{ item.bookNumber }} เพิ่มผู้เช่าห้องพัก + เพิ่มเลขลงรับหนังสือ +
@@ -411,14 +418,20 @@ export default {
- +
-
+
+ + + diff --git a/src/views/Restroom/RoomView.vue b/src/views/Restroom/RoomView.vue index 84afd5b..9c0ccc8 100644 --- a/src/views/Restroom/RoomView.vue +++ b/src/views/Restroom/RoomView.vue @@ -35,6 +35,12 @@ export default { { label: "Laravel", value: "PHP" }, { label: "Phoenix", value: "Elixir" }, ], + typeRoom: [ + { label: "ช1", value: "ช1" }, + { label: "ช2", value: "ช2" }, + { label: "ช3", value: "ช3" }, + ], + listRoom: [ { label: "อาคารแฟลต 1/11", value: "1" }, { label: "อาคารแฟลต 1/12", value: "2" }, @@ -50,6 +56,7 @@ export default { { label: "แฟลตบางเขน 1", value: "5" }, { label: "แฟลตบางเขน 2", value: "5" }, ], + selectedtypeRoom: "ช1", selectedColor: "", statusfree: false, statusreturn: false, @@ -68,6 +75,8 @@ export default { if (index == "unavailable") action = "edit"; if (index == "waiting") action = "add"; if (index == "free") action = "add"; + if (index == "special") action = "special"; + if (index == "return") action = "return"; this.$router.push({ path: `/room/detail/${id}`, query: { mode: action } }); }, onChangeEvent(e) { @@ -166,9 +175,17 @@ export default {
+
+ + +
-
{{ selectedlistRoom }}
+
{{ selectedlistRoom?.label }}

คณะกรรมการประจําตึก : มารุช ดีงาม , บารมี ดีงาม - รอคืนห้อง + ผ่อนผัน

@@ -250,25 +267,23 @@ export default { 'bg-return': item?.status == 'return', 'bg-special': item?.status == 'special', }" - :style="{ width: `115px`, height: `170px` }" + :style="{ width: `220px`, height: `170px` }" >

- {{ item?.title }} + {{ item?.title }}

- {{ "รอคืนห้อง" }} + {{ "ผ่อนผัน" }}

-

- {{ item?.firstName }} +

+ {{ item?.ranks }} {{ item?.firstName }} + {{ item?.laststName }}

-

+

+ {{ item?.ranks }} {{ item?.firstName }} {{ item?.laststName }}

@@ -313,7 +330,7 @@ export default { {{ "กรณีพิเศษ" }}
@@ -412,24 +429,24 @@ export default {