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 cbad382..f020906 100644 --- a/src/main/java/cn/palmte/work/controller/backend/ProjectController.java +++ b/src/main/java/cn/palmte/work/controller/backend/ProjectController.java @@ -848,7 +848,6 @@ public class ProjectController extends BaseController { @RequestMapping("/info/{projectId}") public ResponseMsg info(@PathVariable int projectId,Map model) { Project project = projectService.getProject(projectId); - model.put("info",project); return ResponseMsg.buildSuccessData(project); } diff --git a/src/main/resources/templates/admin/project_estimate_add.ftl b/src/main/resources/templates/admin/project_estimate_add.ftl index dc87a67..801b505 100644 --- a/src/main/resources/templates/admin/project_estimate_add.ftl +++ b/src/main/resources/templates/admin/project_estimate_add.ftl @@ -326,6 +326,33 @@ > + + 项目阶段: + + + + + + 当前进度描述: + + + + <#--
--> <#--
--> diff --git a/src/main/resources/templates/admin/project_list.ftl b/src/main/resources/templates/admin/project_list.ftl index bc8cbb2..4ba05cb 100644 --- a/src/main/resources/templates/admin/project_list.ftl +++ b/src/main/resources/templates/admin/project_list.ftl @@ -456,18 +456,18 @@
项目阶段
- - - - - - - - - - - + + + + + + + + + +
@@ -1229,17 +1229,17 @@ *项目阶段
@@ -1388,8 +1388,8 @@ keywordsObj.otherStart = $("#otherStart").val(); if ($("#otherEnd").val()) keywordsObj.otherEnd = $("#otherEnd").val(); - if ($("#qstage").val()) - keywordsObj.stage = $("#qstage").val(); + if ($("#stage").val()) + keywordsObj.stage = $("#stage").val(); } if ($("#customer").val()) keywordsObj.customer = $("#customer").val(); @@ -1530,6 +1530,8 @@ keywordsObj.otherStart = $("#otherStart").val(); if ($("#otherEnd").val()) keywordsObj.otherEnd = $("#otherEnd").val(); + if ($("#stage").val()) + keywordsObj.stage = $("#stage").val(); } if ($("#customer").val()) keywordsObj.customer = $("#customer").val(); @@ -1635,8 +1637,7 @@ * 项目阶段更新保存 */ var stageRefreshSave = function () { - var stage = $("#stage").val(); - console.info("=============="+stage); + var stage = $("#modalStage").val(); var stageRemark = $("#stageRemark").val(); var projectId = $("#stageProjectId").val(); if (stage == '') { @@ -1808,7 +1809,8 @@ type: 'post', async: false, success: function (data) { - $("#stage").val(data.data.stage); + $("#modalStage").val(data.data.stage); + $("#modalStage option[value='"+data.data.stage+"']").attr("selected","selected"); $("#stageRemark").val(data.data.stageRemark); } }); diff --git a/src/main/resources/templates/admin/project_list_approve.ftl b/src/main/resources/templates/admin/project_list_approve.ftl index 6f788ae..a58c675 100644 --- a/src/main/resources/templates/admin/project_list_approve.ftl +++ b/src/main/resources/templates/admin/project_list_approve.ftl @@ -448,6 +448,27 @@
+ +
+
+
项目阶段
+
+ +
+
+
@@ -737,6 +758,8 @@ keywordsObj.otherStart = $("#otherStart").val(); if ($("#otherEnd").val()) keywordsObj.otherEnd = $("#otherEnd").val(); + if ($("#stage").val()) + keywordsObj.stage = $("#stage").val(); } if ($("#customer").val()) keywordsObj.customer = $("#customer").val();