Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
SMGO
pms-client
Commits
babc3a67
Commit
babc3a67
authored
4 years ago
by
Koolapong Kongpitak
Browse files
Options
Download
Email Patches
Plain Diff
Fixed UAT
parent
23d6abff
dev
Features
MA
QA
Release
TUM-DEV
master
num-dev
v12.00
v11.28
v11.27
v11.26
v11.25
v11.24
v11.23QA
v11.22QA
v11.21QA
v11.20
v11.20QA
v11.19QA
v11.18
v11.17
v11.16QA
v11.15QA
v11.14QA
v11.12
v11.11QA
v11.10QA
v11.09
4 merge requests
!241
Ma
,
!240
Account
,
!201
Dev
,
!158
Dev
Changes
8
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
PMS/ClientApp/src/app/components/shared/auto-table-hl/auto-table-hl.component.html
+1
-1
...ponents/shared/auto-table-hl/auto-table-hl.component.html
PMS/ClientApp/src/app/components/shared/auto-table-hl/auto-table-hl.component.ts
+1
-0
...omponents/shared/auto-table-hl/auto-table-hl.component.ts
PMS/ClientApp/src/app/components/shared/auto-table/auto-table.component.html
+1
-1
...pp/components/shared/auto-table/auto-table.component.html
PMS/ClientApp/src/app/components/shared/auto-table/auto-table.component.ts
+26
-25
.../app/components/shared/auto-table/auto-table.component.ts
PMS/ClientApp/src/app/pages/accounting/SNSE069_M/SNSE069_M.component.ts
+4
-2
...src/app/pages/accounting/SNSE069_M/SNSE069_M.component.ts
PMS/ClientApp/src/app/pages/accounting/SNSJ006_M/SNSJ006_M.component.ts
+2
-1
...src/app/pages/accounting/SNSJ006_M/SNSJ006_M.component.ts
PMS/ClientApp/src/app/pages/accounting/SNSJ006_M2/SNSJ006_M2.component.ts
+2
-1
...c/app/pages/accounting/SNSJ006_M2/SNSJ006_M2.component.ts
PMS/ClientApp/src/app/pages/saleorder/SNSQ005_001/SNSQ005_001.component.ts
+5
-5
.../app/pages/saleorder/SNSQ005_001/SNSQ005_001.component.ts
with
42 additions
and
36 deletions
+42
-36
PMS/ClientApp/src/app/components/shared/auto-table-hl/auto-table-hl.component.html
+
1
-
1
View file @
babc3a67
...
...
@@ -125,6 +125,6 @@
<mat-progress-bar
mode=
"indeterminate"
*ngIf=
"showProgressBar"
></mat-progress-bar>
<div
class=
"norecfound"
*ngIf=
"showNoRecord"
>
No record found
</div>
<mat-paginator
[hidden]=
"!showPagination"
[pageSizeOptions]=
"[
10
, 20, 50, 100]"
showFirstLastButtons
>
<mat-paginator
[hidden]=
"!showPagination"
[pageSizeOptions]=
"[
minpage
, 20, 50, 100]"
showFirstLastButtons
>
</mat-paginator>
</div>
\ No newline at end of file
This diff is collapsed.
Click to expand it.
PMS/ClientApp/src/app/components/shared/auto-table-hl/auto-table-hl.component.ts
+
1
-
0
View file @
babc3a67
...
...
@@ -71,6 +71,7 @@ export class AutoTableHighlightComponent implements OnChanges {
@
Input
(
"
stickyCol
"
)
stickyCol
:
string
|
Array
<
string
>
;
@
Input
(
"
stickyEndCol
"
)
stickyEndCol
:
string
|
Array
<
string
>
;
@
Input
(
"
hideColumns
"
)
hideColumns
:
Array
<
string
>
=
[];
@
Input
(
"
minpage
"
)
minpage
:
number
=
10
;
@
ContentChildren
(
TemplateRef
)
templateRef
;
@
ViewChild
(
"
table
"
)
table
:
any
;
...
...
This diff is collapsed.
Click to expand it.
PMS/ClientApp/src/app/components/shared/auto-table/auto-table.component.html
+
1
-
1
View file @
babc3a67
...
...
@@ -126,6 +126,6 @@
<mat-progress-bar
mode=
"indeterminate"
*ngIf=
"showProgressBar"
></mat-progress-bar>
<div
class=
"norecfound"
*ngIf=
"showNoRecord"
>
No record found
</div>
<mat-paginator
[hidden]=
"!showPagination"
[pageSizeOptions]=
"[
10
, 20, 50, 100]"
showFirstLastButtons
>
<mat-paginator
[hidden]=
"!showPagination"
[pageSizeOptions]=
"[
minpage
, 20, 50, 100]"
showFirstLastButtons
>
</mat-paginator>
</div>
\ No newline at end of file
This diff is collapsed.
Click to expand it.
PMS/ClientApp/src/app/components/shared/auto-table/auto-table.component.ts
+
26
-
25
View file @
babc3a67
...
...
@@ -66,6 +66,7 @@ export class AutoTableComponent implements OnChanges {
@
Input
(
"
stickyCol
"
)
stickyCol
:
string
|
Array
<
string
>
;
@
Input
(
"
stickyEndCol
"
)
stickyEndCol
:
string
|
Array
<
string
>
;
@
Input
(
"
hideColumns
"
)
hideColumns
:
Array
<
string
>
=
[];
@
Input
(
"
minpage
"
)
minpage
:
number
=
10
;
@
Output
(
"
editClick
"
)
editClick
=
new
EventEmitter
<
any
>
();
@
ContentChildren
(
TemplateRef
)
templateRef
;
...
...
@@ -109,12 +110,12 @@ export class AutoTableComponent implements OnChanges {
this
.
dataList
.
paginator
=
this
.
paginator
;
}
this
.
dataList
.
sort
=
this
.
sort
;
if
(
this
.
tableFooter
&&
this
.
tableFooter
.
length
>
0
)
{
setTimeout
(()
=>
{
this
.
setFooterItems
(
this
.
tableFooter
)
},
100
);
}
this
.
dataList
.
filterPredicate
=
(
data
,
filterObject
:
string
):
boolean
=>
{
...
...
@@ -162,30 +163,30 @@ export class AutoTableComponent implements OnChanges {
}
setFooterItems
(
footers
:
Array
<
any
>
)
{
this
.
displayFooter
=
[];
this
.
displayFooter
=
this
.
headerList
.
map
(
h
=>
{
let
fieldName
=
h
.
FIELD_NAME
;
let
value
,
colspan
;
let
footer
=
footers
.
find
(
f
=>
f
.
fieldName
===
fieldName
);
if
(
footer
&&
footer
.
show
)
{
if
(
!
footer
.
value
&&
h
.
DATA_TYPE
===
'
number
'
)
{
let
sumValue
=
this
.
tableData
.
reduce
((
v
,
o
)
=>
parseFloat
(
o
[
fieldName
])
===
o
[
fieldName
]
?
v
+
parseFloat
(
o
[
fieldName
]):
v
,
0
);
value
=
sumValue
||
0
;
}
else
if
(
footer
.
value
)
{
value
=
footer
.
value
;
}
else
{
value
=
null
;
}
colspan
=
footer
.
colspan
;
this
.
displayFooter
=
this
.
headerList
.
map
(
h
=>
{
let
fieldName
=
h
.
FIELD_NAME
;
let
value
,
colspan
;
let
footer
=
footers
.
find
(
f
=>
f
.
fieldName
===
fieldName
);
if
(
footer
&&
footer
.
show
)
{
if
(
!
footer
.
value
&&
h
.
DATA_TYPE
===
'
number
'
)
{
let
sumValue
=
this
.
tableData
.
reduce
((
v
,
o
)
=>
parseFloat
(
o
[
fieldName
])
===
o
[
fieldName
]
?
v
+
parseFloat
(
o
[
fieldName
])
:
v
,
0
);
value
=
sumValue
||
0
;
}
else
if
(
footer
.
value
)
{
value
=
footer
.
value
;
}
else
{
value
=
null
;
}
return
{
FIELD_NAME
:
fieldName
,
VALUE
:
value
,
COLSPAN
:
colspan
||
1
};
})
colspan
=
footer
.
colspan
;
}
return
{
FIELD_NAME
:
fieldName
,
VALUE
:
value
,
COLSPAN
:
colspan
||
1
};
})
}
getFooterValue
(
fieldName
)
{
...
...
@@ -269,6 +270,6 @@ export class AutoTableComponent implements OnChanges {
ArrangeShowColumn
(
data
)
{
this
.
displayedColumns
=
data
.
filter
(
v
=>
this
.
hideColumns
.
indexOf
(
v
.
FIELD_NAME
)
<
0
)
.
map
(
v
=>
v
.
FIELD_NAME
);
.
map
(
v
=>
v
.
FIELD_NAME
);
}
}
This diff is collapsed.
Click to expand it.
PMS/ClientApp/src/app/pages/accounting/SNSE069_M/SNSE069_M.component.ts
+
4
-
2
View file @
babc3a67
...
...
@@ -249,7 +249,8 @@ export class SNSE069_MComponent implements OnInit {
P_COMPANY_CODE
:
this
.
global
.
GetTokenDetail
(
"
ssComCode
"
),
P_SEQ_NO_FROM
:
this
.
SData
.
SEQ_NO_FROM
,
P_SEQ_NO_TO
:
this
.
SData
.
SEQ_NO_TO
,
P_LOCATION_NO
:
location
P_LOCATION_NO
:
location
,
P_FORM_ID
:
'
SNSE069_M
'
}
this
.
http
.
getParams
(
"
AC
"
,
[
"
SNSE069_M_GenerateReport
"
,
"
PMS_RPT_ACC_SNSR022_M
"
,
"
PMS_RPT_ACC_SNSR023_M
"
,
fileName1
,
fileName2
],
reportParams
)
...
...
@@ -293,7 +294,8 @@ export class SNSE069_MComponent implements OnInit {
P_COMPANY_CODE
:
this
.
global
.
GetTokenDetail
(
"
ssComCode
"
),
P_SEQ_NO_FROM
:
this
.
SData
.
SEQ_NO_FROM
,
P_SEQ_NO_TO
:
this
.
SData
.
SEQ_NO_TO
,
P_LOCATION_NO
:
location
P_LOCATION_NO
:
location
,
P_FORM_ID
:
'
SNSE069_M
'
}
this
.
http
.
getParams
(
"
AC
"
,
[
"
SNSE069_M_GenerateReport
"
,
"
PMS_RPT_ACC_SNSR022_M
"
,
"
PMS_RPT_ACC_SNSR023_M
"
,
fileName1
,
fileName2
],
reportParams
)
...
...
This diff is collapsed.
Click to expand it.
PMS/ClientApp/src/app/pages/accounting/SNSJ006_M/SNSJ006_M.component.ts
+
2
-
1
View file @
babc3a67
...
...
@@ -73,7 +73,8 @@ export class SNSJ006_MComponent implements OnInit {
P_COMPANY_CODE
:
this
.
global
.
GetTokenDetail
(
"
ssComCode
"
),
P_SEQ_NO_FROM
:
item
[
"
SEQ_FROM
"
],
P_SEQ_NO_TO
:
item
[
"
SEQ_TO
"
],
P_LOCATION_NO
:
location
P_LOCATION_NO
:
location
,
P_FORM_ID
:
'
SNSJ006_M
'
}
let
fileName1
=
"
SNSR022
"
+
"
_
"
+
location
+
'
_
'
+
this
.
FormatDate
()
+
"
.
"
+
"
PDF
"
;
...
...
This diff is collapsed.
Click to expand it.
PMS/ClientApp/src/app/pages/accounting/SNSJ006_M2/SNSJ006_M2.component.ts
+
2
-
1
View file @
babc3a67
...
...
@@ -51,7 +51,8 @@ export class SNSJ006_M2Component implements OnInit {
P_COMPANY_CODE
:
this
.
global
.
GetTokenDetail
(
"
ssComCode
"
),
P_SEQ_NO_FROM
:
item
[
"
SEQ_FROM
"
],
P_SEQ_NO_TO
:
item
[
"
SEQ_TO
"
],
P_LOCATION_NO
:
location
P_LOCATION_NO
:
location
,
P_FORM_ID
:
'
SNSJ006_M2
'
}
let
fileName1
=
"
SNSR022
"
+
"
_
"
+
location
+
'
_
'
+
this
.
FormatDate
()
+
"
.
"
+
"
PDF
"
;
let
fileName2
=
"
SNSR023
"
+
"
_
"
+
location
+
'
_
'
+
this
.
FormatDate
()
+
"
.
"
+
"
PDF
"
...
...
This diff is collapsed.
Click to expand it.
PMS/ClientApp/src/app/pages/saleorder/SNSQ005_001/SNSQ005_001.component.ts
+
5
-
5
View file @
babc3a67
...
...
@@ -30,10 +30,10 @@ export class SNSQ005_001Component implements OnInit {
@
ViewChild
(
"
ShowDetail
"
,
{
static
:
false
})
dialogDetail
;
public
PageTitle
:
string
;
public
info
:
any
=
[]
;
public
partData
:
any
=
[]
;
public
ExiseTax
:
any
=
[]
;
public
stockData
:
any
=
[]
;
public
info
:
any
=
{}
;
public
partData
:
any
=
{}
;
public
ExiseTax
:
any
=
{}
;
public
stockData
:
any
=
{}
;
public
dataList
:
any
=
[];
public
dataDetail
:
any
=
{};
...
...
@@ -112,7 +112,7 @@ export class SNSQ005_001Component implements OnInit {
this
.
http
.
get
(
"
IC
"
,
"
SNSQ005_GetPartInfo_G2
"
,
this
.
partData
.
PART_NO
)
.
subscribe
(
result
=>
{
this
.
ExiseTax
=
result
.
Table
[
0
];
this
.
ExiseTax
=
result
.
Table
[
0
]
||
{}
;
})
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment
Menu
Projects
Groups
Snippets
Help