mula
/
fourcal
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

待我审批的项目

master
pengqiang 2021-11-17 15:35:34 +08:00
parent f1670578cc
commit 57db8d6bf3
4 changed files with 31 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/cn/palmte/work/controller/backend/ProjectController.java
View File

@ -386,11 +386,12 @@ public class ProjectController extends BaseController {
* @return * @return
*/ */
@RequestMapping("/approve") @RequestMapping("/approve")
public String approve(@RequestParam("id") int id, Map<String, Object> model) { public String approve(@RequestParam("id") int id, @RequestParam String listFrom, Map<String, Object> model) {
Project project = projectService.getProject(id); Project project = projectService.getProject(id);
EstimateBean estimateBean = projectEstimateService.getEstimate(project); EstimateBean estimateBean = projectEstimateService.getEstimate(project);
model.put("estimateBean", estimateBean); model.put("estimateBean", estimateBean);
model.put("project", project); model.put("project", project);
model.put("listFrom", listFrom);
BudgetBean budgetBean = projectBudgetService.getBudget(project); BudgetBean budgetBean = projectBudgetService.getBudget(project);
//预算主页面数据 //预算主页面数据
model.put("budgetBean", budgetBean); model.put("budgetBean", budgetBean);

19
src/main/resources/templates/admin/project_approve.ftl
View File

@ -39,6 +39,7 @@
<div class="am-tabs-bd"> <div class="am-tabs-bd">
<div class="am-tab-panel am-fade am-in am-active" id="tab1"> <div class="am-tab-panel am-fade am-in am-active" id="tab1">
<input name="id" id="id" type="hidden" value="${project.id}"/> <input name="id" id="id" type="hidden" value="${project.id}"/>
<input name="listFrom" id="listFrom" type="hidden" value="${listFrom}"/>
<input name="projectContributionProfitRateThreshold" <input name="projectContributionProfitRateThreshold"
id="projectContributionProfitRateThreshold" type="hidden" id="projectContributionProfitRateThreshold" type="hidden"
value="${project.projectContributionProfitRateThreshold}"/> value="${project.projectContributionProfitRateThreshold}"/>
@ -2096,7 +2097,8 @@
success: function (data) { success: function (data) {
if (data.status == 0) { if (data.status == 0) {
alert(data.msg); alert(data.msg);
window.location.href = '${base}/project/list'; var listFrom = $("#listFrom").val();
window.location.href = '${base}/project/' + listFrom;
} else if (data.status == 1) { } else if (data.status == 1) {
alert(data.msg); alert(data.msg);
} }
@ -2104,18 +2106,3 @@
}); });
} }
</script> </script>

6
src/main/resources/templates/admin/project_list.ftl
View File

@ -212,7 +212,7 @@
<#-- </@shiro.hasPermission> <#-- </@shiro.hasPermission>
<@shiro.hasPermission name="PROJECT_EDIT">--> <@shiro.hasPermission name="PROJECT_EDIT">-->
<#-- 概算审核通过 并且预算审批状态为草稿和不通过 --> <#-- 概算审核通过 并且预算审批状态为草稿和不通过 -->
<#if list.approveStatusEstimate=2 && (list.approveStatusBudget==0 || list.approveStatusBudget==3) > <#if list.approveStatusEstimate=2 && (list.approveStatusBudget==-1 || list.approveStatusBudget==0 || list.approveStatusBudget==3) >
<button type="button" <button type="button"
class="am-btn am-btn-default am-btn-xs am-text-secondary" class="am-btn am-btn-default am-btn-xs am-text-secondary"
onclick="location.href='${base}/project/budgetEdit?id=${list.id}'"><span onclick="location.href='${base}/project/budgetEdit?id=${list.id}'"><span
@ -222,7 +222,7 @@
<#-- </@shiro.hasPermission>--> <#-- </@shiro.hasPermission>-->
<#-- 预算审核通过 并且结算审核不等于审批状态 决算审批未通过 才可以发起结算--> <#-- 预算审核通过 并且结算审核不等于审批状态 决算审批未通过 才可以发起结算-->
<#if list.approveStatusBudget=2 && list.approveStatusSettle!=1 && list.approveStatusFinal !=2> <#if list.approveStatusBudget=2 && list.approveStatusSettle !=1 && list.approveStatusFinal !=2>
<button type="button" <button type="button"
class="am-btn am-btn-default am-btn-xs am-text-secondary" class="am-btn am-btn-default am-btn-xs am-text-secondary"
onclick="location.href='${base}/project/settle/add?id=${list.id}'"><span onclick="location.href='${base}/project/settle/add?id=${list.id}'"><span
@ -249,7 +249,7 @@
<#if adminId==list.approveId> <#if adminId==list.approveId>
<button type="button" <button type="button"
class="am-btn am-btn-default am-btn-xs am-text-secondary" class="am-btn am-btn-default am-btn-xs am-text-secondary"
onclick="location.href='${base}/project/approve?id=${list.id}'"><span onclick="location.href='${base}/project/approve?listFrom=list&id=${list.id}'"><span
class="am-icon-pencil-square-o"></span>审核 class="am-icon-pencil-square-o"></span>审核
</button> </button>
</#if> </#if>

57
src/main/resources/templates/admin/project_list_approve.ftl
View File

@ -64,11 +64,10 @@
<div class="am-u-sm-10"> <div class="am-u-sm-10">
<select data-am-selected id="status" name="status"> <select data-am-selected id="status" name="status">
<option value="-1">全部</option> <option value="-1">全部</option>
<option value="1" <#if status?? && status='1'>selected</#if>>项目创建</option> <option value="1" <#if status?? && status='1'>selected</#if>>项目创建(概算)</option>
<option value="5" <#if status?? && status='5'>selected</#if>>概算完成</option> <option value="5" <#if status?? && status='5'>selected</#if>>预算</option>
<option value="10" <#if status?? && status='10'>selected</#if>>预算完成</option> <option value="10" <#if status?? && status='10'>selected</#if>>结算</option>
<option value="15" <#if status?? && status='15'>selected</#if>>结算中</option> <option value="15" <#if status?? && status='15'>selected</#if>>决算</option>
<option value="20" <#if status?? && status='20'>selected</#if>>决算完成</option>
</select> </select>
</div> </div>
</td> </td>
@ -194,20 +193,24 @@
<td> <td>
<div class="am-btn-toolbar"> <div class="am-btn-toolbar">
<div class="am-btn-group am-btn-group-xs"> <div class="am-btn-group am-btn-group-xs">
<#--<@shiro.hasPermission name="PROJECT_EDIT"> <button type="button"
<button type="button" class="am-btn am-btn-default am-btn-xs am-text-secondary"
class="am-btn am-btn-default am-btn-xs am-text-secondary" onclick="location.href='${base}/project/detail?id=${list.id}'"><span
onclick="location.href='${base}/project/edit?id=${list.id}'"><span class="am-icon-pencil-square-o"></span>查看
class="am-icon-pencil-square-o"></span>编辑 </button>
</button>
</@shiro.hasPermission> <button type="button"
<@shiro.hasPermission name="PROJECT_EDIT"> class="am-btn am-btn-default am-btn-xs am-text-secondary"
<button type="button" onclick="location.href='${base}/project/approve?listFrom=listApprove&id=${list.id}'"><span
class="am-btn am-btn-default am-btn-xs am-text-secondary" class="am-icon-pencil-square-o"></span>审核
onclick="location.href='${base}/project/budgetEdit?id=${list.id}'"><span </button>
class="am-icon-pencil-square-o"></span>填写预算表
</button> <button type="button"
</@shiro.hasPermission>--> class="am-btn am-btn-default am-btn-xs am-text-secondary"
onclick="location.href='${base}/project/taskRecords/${list.id?c}'"><span
class="am-icon-pencil-square-o"></span>查看审核流程
</button>
</div> </div>
</div> </div>
</td> </td>
@ -292,19 +295,3 @@
}); });
</script> </script>