Commit b8f81dc2 authored by gaoyan's avatar gaoyan

获取模板number

parent 91d16b29
......@@ -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;
}
}
......@@ -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)}';
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment