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

修改样式

master
OathK1per 2022-09-06 10:47:46 +08:00
parent 49e2f63429
commit 9d08b2b4ef
2 changed files with 49 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -997,7 +997,26 @@ public class ProjectController extends BaseController {
// projectService.saveApprove(project, InterfaceUtil.getAdmin());
//
// return ResponseMsg.buildSuccessMsg("提交成功");
return ResponseMsg.buildFailedMsg("请到编辑页面提交审核");
return ResponseMsg.buildFailedMsg("即将跳转详情页确认提交内容，请在确认后再提交");
}
/**
* 提交审核跳转编辑页面，根据状态区分去哪个页面
*/
@RequestMapping("/toEditAllStatus")
@ResponseBody
public String toEditAllStatus(int id) throws Exception {
Project project = projectRepository.findOne(id);
if (project.getStatus() == Project.STATUS_ESTIMATE) {
return "redirect:/project/edit?id=" + id;
} else if (project.getStatus() == Project.STATUS_BUDGET) {
return "redirect:/project/budget?id=" + id;
} else if (project.getStatus() == Project.STATUS_SETTLE) {
return "redirect:/project/settle/edit?id=" + id;
} else if (project.getStatus() == Project.STATUS_FINAL) {
return "redirect:/project/final/edit?id=" + id;
}
return "redirect:/project/list";
}
/**

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

@ -495,7 +495,7 @@
<#if (list.creatorId==adminId && list.approveStatusEstimate == 0) || (list.creatorId==adminId && list.approveStatusBudget == 0) || (admin.getRoleLevel() = 6 && list.approveStatusSettle == 0 && list.approveStatusBudget == 2) || ((admin.getRoleLevel() = 2 || admin.getRoleLevel() = 6) && list.approveStatusFinal == 0)>
<button type="button"
class="am-btn am-btn-default am-btn-xs am-text-secondary"
onclick="approveProject(${list.id})"><span
onclick="approveProject(${list.id}, ${list.status})"><span
class="am-icon-pencil-square-o"></span>提交审核
</button>
</#if>
@ -703,22 +703,34 @@
<script src="${base}/common/jQuery-File-Upload/js/jquery.fileupload-validate.js"></script>
<script type="text/javascript">
var approveProject = function (id) {
if (window.confirm('确定要提交审核吗？')) {
$.ajax({
url: '${base}/project/saveApprove',
data: {id:id},
dataType: "json",
async: false,
success: function (data) {
if (data.status == 0) {
alert(data.msg);
window.location.href = window.location.href;
} else if (data.status == 1) {
alert(data.msg);
}
}
});
var approveProject = function (id, status) {
if (window.confirm('即将跳转详情页确认提交内容，请在确认后再提交')) {
if (status == '1') {
location.href = '${base}/project/edit?id=' + id;
} else if (status == '5') {
location.href = '${base}/project/budgetEdit?id=' + id;
} else if (status == '10') {
location.href = '${base}/project/settle/edit?id=' + id;
} else if (status == '15') {
location.href = '${base}/project/final/edit?id=' + id;
} else {
location.href = '${base}/project/list';
}
<#--$.ajax({-->
<#-- url: '${base}/project/saveApprove',-->
<#-- data: {id:id},-->
<#-- dataType: "json",-->
<#-- async: false,-->
<#-- success: function (data) {-->
<#-- if (data.status == 0) {-->
<#-- alert(data.msg);-->
<#-- window.location.href = window.location.href;-->
<#-- } else if (data.status == 1) {-->
<#-- alert(data.msg);-->
<#-- location.href = '${base}/project/toEditAllStatus?id=' + id;-->
<#-- }-->
<#-- }-->
<#--});-->
}
};