diff --git a/src/main/java/cn/palmte/work/controller/backend/ProjectController.java b/src/main/java/cn/palmte/work/controller/backend/ProjectController.java index 8cbadc1..a6de144 100644 --- a/src/main/java/cn/palmte/work/controller/backend/ProjectController.java +++ b/src/main/java/cn/palmte/work/controller/backend/ProjectController.java @@ -160,6 +160,15 @@ public class ProjectController extends BaseController{ projectService.budgetEditSave(project, budgetBean, InterfaceUtil.getAdmin(), ApproveStatusEnum.APPROVAL_UNCOMMIT); return "redirect:/project/list"; } + /** + * 进行项目预算保存并提交审核 + */ + @RequestMapping("/budgetEditSaveAndApprove") + public String budgetEditSaveAndApprove(Project project, BudgetBean budgetBean, + Map model) { + projectService.budgetEditSave(project, budgetBean, InterfaceUtil.getAdmin(), ApproveStatusEnum.APPROVAL_PENDING); + return "redirect:/project/list"; + } /** * 保存收入明细 diff --git a/src/main/resources/templates/admin/project_budget_edit.ftl b/src/main/resources/templates/admin/project_budget_edit.ftl index e6c7a95..198297e 100644 --- a/src/main/resources/templates/admin/project_budget_edit.ftl +++ b/src/main/resources/templates/admin/project_budget_edit.ftl @@ -81,7 +81,7 @@
*垫资模式
- @@ -179,7 +179,7 @@
收入 - 收入明细表 + 收入明细表 @@ -215,8 +215,8 @@
成本 - 采购成本明细表 - 项目管理成本表 + 采购成本明细表 + 项目管理成本表 @@ -278,7 +278,7 @@
管理 - 资金计划表 + 资金计划表 @@ -321,7 +321,7 @@
现金流量表 - 资金计划表 + 资金计划表 @@ -391,6 +391,74 @@ + + + + +
+
+
新增销售收入明细表——${project.name}
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
类别名称单位数量单价税率（%）含税总金额（元）不含税金额（元）
+ +
+ +
+
+
+ 取消 + 提交 +
+
+
+ + + +
@@ -412,6 +480,18 @@ $("#pmsForm").attr("action","${base}/project/budgetEditSaveAndApprove"); $("#pmsForm").submit(); }); + + $("#income-detail").click(function () { + $('#my-prompt-income-detail').modal({ + relatedTarget: this, + onConfirm: function(e) { + console.log(e); + alert('你输入的是：' + e.data || '') + }, + onCancel: function(e) { + } + }); + }); });