Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
A
apps-collaboration
Project
Project
Details
Activity
Releases
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
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
高燕
apps-collaboration
Commits
b8f81dc2
Commit
b8f81dc2
authored
Aug 29, 2020
by
gaoyan
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
获取模板number
parent
91d16b29
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
21 additions
and
2 deletions
+21
-2
CollaborationController.java
...pps/collaboration/controller/CollaborationController.java
+20
-2
summary.jsp
src/main/webapp/WEB-INF/jsp/apps/collaboration/summary.jsp
+1
-0
No files found.
src/main/java/com/seeyon/apps/collaboration/controller/CollaborationController.java
View file @
b8f81dc2
...
...
@@ -2163,6 +2163,11 @@ public class CollaborationController extends BaseController {
SupervisionApi
supervisionApi
=
(
SupervisionApi
)
AppContext
.
getBean
(
"supervisionApi"
);
mav
.
addObject
(
"supervisionItems"
,
supervisionApi
.
listSuperviseItem
(
categoryID
));
}
if
(
null
!=
summaryVO
.
getSummary
().
getTempleteId
())
{
CtpTemplate
ctpTemplate
=
templateManager
.
getCtpTemplate
(
summaryVO
.
getSummary
().
getTempleteId
());
mav
.
addObject
(
"templeteNumber"
,
ctpTemplate
.
getTempleteNumber
());
}
return
mav
;
}
//再次确认态度
...
...
@@ -2538,8 +2543,7 @@ public class CollaborationController extends BaseController {
* @return
* @throws Exception
*/
public
ModelAndView
stepStop
(
HttpServletRequest
request
,
HttpServletResponse
response
)
throws
Exception
{
public
ModelAndView
stepStop
(
HttpServletRequest
request
,
HttpServletResponse
response
)
throws
Exception
{
response
.
setContentType
(
"text/html;charset=UTF-8"
);
String
affairId
=
request
.
getParameter
(
"affairId"
);
Map
<
String
,
Object
>
tempMap
=
new
HashMap
<
String
,
Object
>();
...
...
@@ -3681,4 +3685,18 @@ public class CollaborationController extends BaseController {
atts
,
attsNeedCopy
,
personId
,
null
,
from
);
return
modelAndView
;
}
/**
* 处理下单协同,如果同意弹出模态框
* @param request
* @param response
* @return
* @throws Exception
*/
public
ModelAndView
agreeDealGetMoney
(
HttpServletRequest
request
,
HttpServletResponse
response
)
throws
Exception
{
ModelAndView
mav
=
new
ModelAndView
(
"apps/collaboration/agreeDealGetMoney"
);
String
affairId
=
request
.
getParameter
(
"affairId"
);
mav
.
addObject
(
"allMoney"
,
100
);
return
mav
;
}
}
src/main/webapp/WEB-INF/jsp/apps/collaboration/summary.jsp
View file @
b8f81dc2
...
...
@@ -608,6 +608,7 @@ var openFrom = "${ctp:escapeJavascript(summaryVO.openFrom)}";
var
extFrom
=
"${ctp:escapeJavascript(param.extFrom)}"
;
var
summaryReadOnly
=
'${ctp:escapeJavascript(summaryVO.readOnly)}'
;
var
templateId
=
'${ctp:escapeJavascript(summaryVO.summary.templeteId)}'
;
var
templeteNumber
=
'${ctp:escapeJavascript(templeteNumber)}'
;
var
isSupervise
=
'${ctp:escapeJavascript(summaryVO.openFrom)}'
==
'supervise'
;
var
isCurSuperivse
=
'${CurrentUser.externalType}'
==
'0'
&&
'${ctp:escapeJavascript(summaryVO.openFrom)}'
==
'listDone'
&&
'${summaryVO.isCurrentUserSupervisor}'
==
'true'
;
var
_moduleTypeName
=
'${ctp:escapeJavascript(contentContext.moduleTypeName)}'
;
...
...
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