Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
D
design
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
abookCheck
design
Commits
16e6a9f0
Commit
16e6a9f0
authored
Sep 01, 2022
by
NGO THI HONG
1
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
#19120 update continous work list
parent
ff2b62ae
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
34 additions
and
28 deletions
+34
-28
app/script/check_pu.js
+34
-28
No files found.
app/script/check_pu.js
View file @
16e6a9f0
...
@@ -201,33 +201,39 @@ CHK_pu.createContinousWorkList = function(operationList, isSearched = false) {
...
@@ -201,33 +201,39 @@ CHK_pu.createContinousWorkList = function(operationList, isSearched = false) {
if
(
!
operationList
[
i
].
processList
||
operationList
[
i
].
processList
.
length
==
0
)
continue
;
if
(
!
operationList
[
i
].
processList
||
operationList
[
i
].
processList
.
length
==
0
)
continue
;
//TODO aタグlist.html 転移処理
//TODO aタグlist.html 転移処理
for
(
var
j
=
0
;
j
<
operationList
[
i
].
processList
.
length
;
j
++
)
{
for
(
var
j
=
0
;
j
<
operationList
[
i
].
processList
.
length
;
j
++
)
{
var
messageli
=
$
(
"<li class='item list-unstyled rounded border mb-2' id = 'list_"
+
operationList
[
i
].
processList
[
j
].
processKey
+
"'></li>"
)
;
var
ahrefRequiredFlg
;
for
(
var
g
=
0
;
g
<
operationList
[
i
].
processList
[
j
].
phaseList
.
length
;
g
++
)
if
(
operationList
[
i
].
permitCodeRequiredFlg
==
1
)
{
ahrefRequiredFlg
=
$
(
"<a href=
\"
javascript:CHK.displayAlert('onlyRfid');
\"
class='d-block px-3 py-3 text-decoration-none text-dark'></a>"
);
}
else
{
{
ahrefRequiredFlg
=
$
(
"<a href=
\"
javascript:CHK_L.sendAppCommand('goOperation', '"
+
operationList
[
i
].
operationId
+
"', '"
+
operationList
[
i
].
contentId
if
(
operationList
[
i
].
processList
[
j
].
phaseList
[
g
].
phaseStatus
!=
999
)
+
" ', null ,'DETAIL_FORM_INPUT' ,'CONTINOUS_WORK','"
+
operationList
[
i
].
processList
[
j
].
processKey
+
"');
\"
class='d-block px-3 py-2 text-decoration-none text-dark'></a>"
);
{
var
messageli
=
$
(
"<li class='item list-unstyled rounded border mb-2' id = 'list_"
+
operationList
[
i
].
processList
[
j
].
processKey
+
"'></li>"
)
;
var
ahrefRequiredFlg
;
if
(
operationList
[
i
].
permitCodeRequiredFlg
==
1
)
{
ahrefRequiredFlg
=
$
(
"<a href=
\"
javascript:CHK.displayAlert('onlyRfid');
\"
class='d-block px-3 py-3 text-decoration-none text-dark'></a>"
);
}
else
{
ahrefRequiredFlg
=
$
(
"<a href=
\"
javascript:CHK_L.sendAppCommand('goOperation', '"
+
operationList
[
i
].
operationId
+
"', '"
+
operationList
[
i
].
contentId
+
" ', null ,'DETAIL_FORM_INPUT' ,'CONTINOUS_WORK','"
+
operationList
[
i
].
processList
[
j
].
processKey
+
"');
\"
class='d-block px-3 py-2 text-decoration-none text-dark'></a>"
);
}
var
divTitle
=
$
(
"<div class='title'>"
+
operationList
[
i
].
operationName
+
"</div>"
);
var
divSubTitleWrap
=
$
(
"<div class='sub-title-wrap'> </div>"
);
var
iIcon
=
$
(
"<i class='fas fa-chevron-right fs-12''></i>"
);
var
divProccess
=
$
(
"<div class='tag fs-8 text-secondary px-2 py-1 mr-2 rounded border mb-1'>"
+
operationList
[
i
].
processList
[
j
].
phaseList
[
g
].
phaseName
+
"</div>"
);
var
divCode
=
$
(
" <div class='fs-8 text-secondary mr-2'><div class='data'>"
+
operationList
[
i
].
processList
[
j
].
phaseList
[
g
].
taskCode
+
"</div></div>"
);
var
divSubTitle
=
$
(
"<div class='sub-title'>"
+
operationList
[
i
].
processList
[
j
].
phaseList
[
g
].
taskName
+
"</div>"
);
divSubTitleWrap
.
append
(
divCode
);
divSubTitleWrap
.
append
(
divSubTitle
);
ahrefRequiredFlg
.
append
(
divProccess
);
ahrefRequiredFlg
.
append
(
divTitle
);
ahrefRequiredFlg
.
append
(
divSubTitleWrap
);
ahrefRequiredFlg
.
append
(
iIcon
);
messageli
.
append
(
ahrefRequiredFlg
);
$
(
"#continousWork-list"
).
append
(
messageli
);
CHK_pu
.
countContinousWorkReport
=
CHK_pu
.
countContinousWorkReport
+
1
;
}
}
}
var
divProccess
=
$
(
"<div class='tag fs-8 text-secondary px-2 py-1 mr-2 rounded border mb-1'>"
+
operationList
[
i
].
processList
[
j
].
phaseList
[
0
].
phaseName
+
"</div>"
);
var
divTitle
=
$
(
"<div class='title'>"
+
operationList
[
i
].
operationName
+
"</div>"
);
var
divSubTitleWrap
=
$
(
"<div class='sub-title-wrap'> </div>"
);
var
divCode
=
$
(
" <div class='fs-8 text-secondary mr-2'><div class='data'>"
+
"code-0001"
+
"</div></div>"
);
var
divSubTitle
=
$
(
"<div class='sub-title'>"
+
operationList
[
i
].
operationName
+
"</div>"
);
var
iIcon
=
$
(
"<i class='fas fa-chevron-right fs-12''></i>"
);
divSubTitleWrap
.
append
(
divCode
);
ahrefRequiredFlg
.
append
(
divProccess
);
ahrefRequiredFlg
.
append
(
divTitle
);
ahrefRequiredFlg
.
append
(
divSubTitleWrap
);
ahrefRequiredFlg
.
append
(
divSubTitle
);
ahrefRequiredFlg
.
append
(
iIcon
);
messageli
.
append
(
ahrefRequiredFlg
);
$
(
"#continousWork-list"
).
append
(
messageli
);
CHK_pu
.
countContinousWorkReport
=
CHK_pu
.
countContinousWorkReport
+
1
;
}
}
}
}
}
}
...
@@ -291,11 +297,11 @@ CHK_pu.createReportWithWarning = function(operationList, isSearched = false) {
...
@@ -291,11 +297,11 @@ CHK_pu.createReportWithWarning = function(operationList, isSearched = false) {
case
3
:
case
3
:
operationNameLi
=
$
(
"<li class='item list-unstyled rounded border mb-2' id = 'list_"
+
operationList
[
i
].
warningReportList
[
j
].
taskKey
operationNameLi
=
$
(
"<li class='item list-unstyled rounded border mb-2' id = 'list_"
+
operationList
[
i
].
warningReportList
[
j
].
taskKey
+
"'><a href=
\"
javascript:CHK_L.sendAppCommand('goOperation', '"
+
operationList
[
i
].
operationId
+
"', '"
+
operationList
[
i
].
contentId
+
"'><a href=
\"
javascript:CHK_L.sendAppCommand('goOperation', '"
+
operationList
[
i
].
operationId
+
"', '"
+
operationList
[
i
].
contentId
+
" ', null ,'DETAIL_FORM_INPUT' ,'REPORT_WARNING','"
+
operationList
[
i
].
warningReportList
[
j
].
processKey
+
"');
\"
class='d-block px-3 py-2 text-decoration-none text-dark'>"
+
" ', null ,'DETAIL_FORM_INPUT' ,'REPORT_WARNING','"
+
operationList
[
i
].
warningReportList
[
j
].
processKey
+
"');
\"
class='d-block px-3 py-2 text-decoration-none text-dark'>"
+
"<div class='tag fs-8 text-secondary px-2 py-1 mr-2 rounded border mb-1'>"
+
operationList
[
i
].
processList
[
0
].
p
rocess
Name
+
"<div class='tag fs-8 text-secondary px-2 py-1 mr-2 rounded border mb-1'>"
+
operationList
[
i
].
processList
[
0
].
p
haseList
[
0
].
phase
Name
+
"</div> <div class='title'>"
+
operationList
[
i
].
operationName
+
"</div> <div class='title'>"
+
operationList
[
i
].
operationName
+
"</div> <div class='sub-title-wrap'> <div class='fs-8 text-secondary mr-2'><div class='data'>"
+
operationList
[
i
].
warningReportList
[
j
].
taskCode
+
"</div> <div class='sub-title-wrap'> <div class='fs-8 text-secondary mr-2'><div class='data'>"
+
operationList
[
i
].
warningReportList
[
j
].
taskCode
+
"</div></div> <div class='sub-title'>"
+
operationList
[
i
].
operation
Name
+
"</div></div> <div class='sub-title'>"
+
operationList
[
i
].
warningReportList
[
j
].
task
Name
+
"</div></div> <i class='fas fa-chevron-right fs-12''></i> </a></li>"
);
+
"</div></div> <i class='fas fa-chevron-right fs-12''></i> </a></li>"
);
break
;
break
;
...
...
NGUYEN HOANG SON
@hoangson
mentioned in commit
a2cd83c2
Sep 01, 2022
mentioned in commit
a2cd83c2
mentioned in commit a2cd83c277790b69465d4baf58d235aa0f03085c
Toggle commit list
Write
Preview
Markdown
is supported
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