| @@ -18,7 +18,7 @@ var userUpdate = '/transaction/member/edit' //修改用户信息类接口 | |||||
| @purl /activiti/process/listHistory | @purl /activiti/process/listHistory | ||||
| @param | @param | ||||
| */ | */ | ||||
| var listHistory = '/activiti/process/listHistory' //审批历史查询 | |||||
| var listHistory = '/approval/audit/historyList' //审批历史查询 | |||||
| /* | /* | ||||
| @purl /getInfo | @purl /getInfo | ||||
| @@ -325,7 +325,8 @@ define(['jquery', "template", "Tools", "user", "paging","cupload","kindeditor", | |||||
| //我的报名 | //我的报名 | ||||
| tools.doGet(getSignupByMemberId, {memberId:content.id,pageNum:module.data.pageNum,pageSize:module.data.pageSize}, module.application); | tools.doGet(getSignupByMemberId, {memberId:content.id,pageNum:module.data.pageNum,pageSize:module.data.pageSize}, module.application); | ||||
| tools.doPost(listHistory, {processInstanceId:content.instanceId}, module.listHistory); | |||||
| tools.doGet(listHistory + '/' + content.auditbatchNo, {}, module.listHistory); | |||||
| //个人资料提交 | //个人资料提交 | ||||
| $('#supplyAction').on('click', module.supplyAction) | $('#supplyAction').on('click', module.supplyAction) | ||||
| $('#releaseAction').on('click', module.releaseAction) | $('#releaseAction').on('click', module.releaseAction) | ||||
| @@ -775,23 +775,19 @@ | |||||
| <table width="100%" cellspacing="0" cellpadding="0" id="listHistoryContent"> | <table width="100%" cellspacing="0" cellpadding="0" id="listHistoryContent"> | ||||
| <script id="listHistoryData" type="text/html"> | <script id="listHistoryData" type="text/html"> | ||||
| <tr> | <tr> | ||||
| <td>活动名称</td> | |||||
| <td>办理人ID</td> | |||||
| <td>办理人</td> | |||||
| <td>批次号</td> | |||||
| <td>审批节点</td> | |||||
| <td>审批人</td> | |||||
| <td>审批意见</td> | <td>审批意见</td> | ||||
| <td>开始时间</td> | |||||
| <td>结束时间</td> | |||||
| <td>耗时</td> | |||||
| <td>审批时间</td> | |||||
| </tr> | </tr> | ||||
| {{each listHistory as value i}} | {{each listHistory as value i}} | ||||
| <tr> | <tr> | ||||
| <td>{{value.activityName}}</td> | |||||
| <td>{{value.assignee}}</td> | |||||
| <td>{{value.assigneeName}}</td> | |||||
| <td>{{value.comment}}</td> | |||||
| <td>{{value.startTime}}</td> | |||||
| <td>{{value.endTime}}</td> | |||||
| <td>{{value.durationInMillis}}</td> | |||||
| <td>{{value.auditbatchNo}}</td> | |||||
| <td>{{value.nodeName}}</td> | |||||
| <td>{{value.auditBy}}</td> | |||||
| <td>{{value.auditRemark}}</td> | |||||
| <td>{{value.auditTime}}</td> | |||||
| </tr> | </tr> | ||||
| {{/each}} | {{/each}} | ||||
| </script> | </script> | ||||