Skip to content

Commit

Permalink
Merge pull request #40 from Billing-Wise/dev
Browse files Browse the repository at this point in the history
[release] 1.0.3
  • Loading branch information
Koneweekk committed Aug 7, 2024
2 parents d7c5686 + c19a5fd commit 76af14c
Show file tree
Hide file tree
Showing 7 changed files with 25 additions and 10 deletions.
4 changes: 2 additions & 2 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "billing-wise",
"version": "1.0.2",
"version": "1.0.3",
"private": true,
"type": "module",
"scripts": {
Expand Down
7 changes: 5 additions & 2 deletions src/stores/contract/contractList.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ export const useContractListStore = defineStore('contractList', {
contractList: [],
currentContract: {},
columns: [
{ data: 'id', name: '계약번호',},
{ data: 'id', name: '계약번호', sort:'desc'},
{ data: 'itemName', name: '상품명', },
{ data: 'memberName', name: '회원명', },
{ data: 'chargeAmount', name: '금액',},
Expand Down Expand Up @@ -37,7 +37,10 @@ export const useContractListStore = defineStore('contractList', {
this.size = number
},
setMaxPage(number) {
this.maxPage = number
this.maxPage = number;
if (number < this.page) {
this.page = number;
}
},
setPage(number) {
if (number <= this.maxPage && number >= 0) {
Expand Down
7 changes: 5 additions & 2 deletions src/stores/invoice/invoiceList.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ export const useInvoiceListStore = defineStore('invoiceList', {
invoiceList: [],
currentInvoice: {},
columns: [
{ data: 'id', name: '청구번호',},
{ data: 'id', name: '청구번호', sort: 'desc'},
{ data: 'contractId', name: '계약번호',},
{ data: 'itemName', name: '상품명', notSortable: true},
{ data: 'memberName', name: '회원명', notSortable: true},
Expand Down Expand Up @@ -40,7 +40,10 @@ export const useInvoiceListStore = defineStore('invoiceList', {
this.size = number
},
setMaxPage(number) {
this.maxPage = number
this.maxPage = number;
if (number < this.page) {
this.page = number;
}
},
setPage(number) {
if (number <= this.maxPage && number >= 0) {
Expand Down
5 changes: 4 additions & 1 deletion src/stores/item.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ export const useItemStore = defineStore('item', {
itemList : [],
currentItem: {},
columns: [
{data: 'id', name:'상품번호', sort:null},
{data: 'id', name:'상품번호', sort:'desc'},
{data:'imageUrl', name:'상품 이미지', sort:null},
{data: 'name', name:'상품명', sort:null},
{data: 'price', name:'가격', sort:null},
Expand All @@ -26,6 +26,9 @@ export const useItemStore = defineStore('item', {
},
setMaxPage(number) {
this.maxPage = number;
if (number < this.page) {
this.page = number;
}
},
setPage(number) {
if (number <= this.maxPage && number >= 0) {
Expand Down
5 changes: 4 additions & 1 deletion src/stores/member/member.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ export const useMemberStore = defineStore('member', {
memberList: [],
currentMember: {},
columns: [
{ data: 'id', name: '회원번호', sort: null },
{ data: 'id', name: '회원번호', sort: 'desc' },
{ data: 'name', name: '이름', sort: null },
{ data: 'email', name: '이메일', sort: null },