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

Merge branch 'develop' of github.com:Frappet/bma-ehr-frontend into me

Browse source
This commit is contained in:
Thanit Konmek 2023-08-29 11:10:19 +07:00
commit ea1f7b5592
26 changed files with 1979 additions and 1391 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/modules/10_order/components/Main.vue
View file

@ -151,7 +151,7 @@ const OriginalDataFetch = async () => {
rows.value = res.data.result.map((e: any) => ({
orderId: e.orderId,
Order: e.orderName,
OrderNum: `${e.orderNo}/${Number(e.fiscalYear) + 543}`,
OrderNum: e.orderNo == '' ? '-' : `${e.orderNo}/${Number(e.fiscalYear) + 543}`,
fiscalYear: Number(e.fiscalYear),
OrderDate: date2Thai(e.orderDate),
OrderBy: e.orderBy,