From 9060f1f2c9a42000b7b5b561398b3fb2f8e475e2 Mon Sep 17 00:00:00 2001 From: OathK1per Date: Tue, 13 Jun 2023 10:42:15 +0800 Subject: [PATCH] =?UTF-8?q?0605=E9=9C=80=E6=B1=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/backend/ProjectController.java | 33 +++-- .../java/cn/palmte/work/model/Project.java | 22 +++ .../work/service/ProjectEstimateService.java | 8 +- .../palmte/work/service/ProjectService.java | 59 ++++++-- src/main/resources/application-dev.properties | 2 +- src/main/resources/application-sit.properties | 2 +- .../templates/admin/project_approve.ftl | 48 +++++-- .../templates/admin/project_budget_edit.ftl | 48 +++++-- .../templates/admin/project_estimate_add.ftl | 36 +++-- .../templates/admin/project_estimate_edit.ftl | 53 +++++-- .../templates/admin/project_list.ftl | 129 ++++++++++++++---- .../templates/admin/project_list_approve.ftl | 78 ++++++++--- 12 files changed, 400 insertions(+), 118 deletions(-) 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 479ec0c..d3630cb 100644 --- a/src/main/java/cn/palmte/work/controller/backend/ProjectController.java +++ b/src/main/java/cn/palmte/work/controller/backend/ProjectController.java @@ -152,10 +152,10 @@ public class ProjectController extends BaseController { downloadHeader(httpServletResponse, Utils.generateExcelName("项目报表"), "application/octet-stream"); String[] headers = {"项目编号", "项目名称", "项目类型", "垫资模式", "垫资利息", "垫资峰值", "项目合同金额", "项目毛利", "项目毛利率", "项目把握度", "汇智产品金额", "华智产品金额", "华三产品金额", "其他产品金额", "项目当前状态", "行业场景应用", "解决方案", "客户名称", "最终用户名称", "预计合同签订时间", "项目计划招标时间", "是否二次合作", "直签", "战略合作对象", - "项目负责人", "价值及风险", "主合同收款条款", "主合同具体解决方案", "计收计划", "审核状态", "当前审核人", "项目创建者", "部门名称","项目阶段", "当前进度描述", "下一步计划", "项目开始时间", "项目结束时间", "最后更新时间"}; + "项目负责人", "价值及风险", "主合同收款条款", "主合同具体解决方案", "计收计划", "审核状态", "当前审核人", "项目创建者", "部门名称","项目阶段", "公司销售阶段", "当前进度描述", "下一步计划", "项目开始时间", "项目结束时间", "最后更新时间"}; String[] exportColumns = {"projectNo", "name", "typeDesc", "underwrittenModeStr", "advanceInterestAmountRound", "advancePeakAmountRound", "contractRound", "grossProfitRound", "grossProfitMarginRound", "certaintyStr", "huizhiRound", "huazhiRound", "huasanRound", "ziguangRound", "statusDesc", "industryScenario", "resolvePlanStr", "customer", "terminalCustomer", "contractTimeStr", "bidsTimeStr", "isSecondStr", "signTypeStr", "collaborator", - "principal", "valueRisk", "mainContractCollectionTerms", "mainContractResolvePlan", "calculationCollection", "approveStatusDesc", "approveName", "creatorName", "deptName","stageName", "stageRemark", "nextPlan", "startDateStr", "endDateStr", "lastUpdateTimeStr"}; + "principal", "valueRisk", "mainContractCollectionTerms", "mainContractResolvePlan", "calculationCollection", "approveStatusDesc", "approveName", "creatorName", "deptName","stageName", "saleStageName", "stageRemark", "nextPlan", "startDateStr", "endDateStr", "lastUpdateTimeStr"}; ExportUtils.exportToExcel(headers, exportColumns, 1, 10000, httpServletResponse.getOutputStream(), (pN, pS) -> projectService.list(searchInfo, pN, pS).getList()); } @@ -173,10 +173,10 @@ public class ProjectController extends BaseController { ExportExcelUtils exportExcelUtils = new ExportExcelUtils(); String[] headers0 = {"部门名称", "项目编号", "项目名称", "项目类型", "项目计划开始时间", "项目计划结束时间", "垫资模式", "合作对象", "垫资利息", "垫资峰值", "合同金额", "项目毛利", "项目毛利率", "华智产品金额", "汇智产品金额", "华三产品金额", "其他产品金额", "项目把握度", "行业场景应用", "项目解决方案", "客户名称", "最终用户名称", - "价值及风险", "项目负责人", "预计合同签订时间", "项目计划招标时间", "是否二次合作", "直签", "主合同收款条款", "主合同具体解决方案", "计收计划","项目阶段", "当前进度描述", "下一步计划"}; + "价值及风险", "项目负责人", "预计合同签订时间", "项目计划招标时间", "是否二次合作", "直签", "主合同收款条款", "主合同具体解决方案", "计收计划","项目阶段", "公司销售阶段", "当前进度描述", "下一步计划"}; String[] columns0 = {"deptName", "projectNo", "name", "typeDesc", "startDate", "endDate", "underwrittenModeStr", "collaborator", "advanceInterestAmountRound", "advancePeakAmountRound", "contractRound", "grossProfitRound", "grossProfitMarginRound", "huazhiRound", "huizhiRound", "huasanRound", "ziguangRound", "certaintyStr", "industryScenario", "resolvePlanStr", "customer", "terminalCustomer", - "valueRisk", "principal", "contractTime", "bidsTime", "isSecondStr", "signTypeStr", "mainContractCollectionTerms", "mainContractResolvePlan", "calculationCollection","stageName", "stageRemark", "nextPlan"}; + "valueRisk", "principal", "contractTime", "bidsTime", "isSecondStr", "signTypeStr", "mainContractCollectionTerms", "mainContractResolvePlan", "calculationCollection","stageName", "saleStageName", "stageRemark", "nextPlan"}; exportExcelUtils.exportProjectExcel(headers0, columns0, project, "yyyy-MM-dd", 0, "项目立项（概算）信息", outputStream); if (project.getStatus() < 5) { @@ -322,6 +322,11 @@ public class ProjectController extends BaseController { model.put("estimateBean", estimateBean); //freemarker可以利用的静态方法 model.put("Utils", FreeMarkerUtil.fromStaticPackage("cn.palmte.work.utils.Utils")); + if (project.getStatus() >= 5) { + model.put("saveStage", 1); + } else { + model.put("saveStage", 0); + } return "admin/project_estimate_edit"; } @@ -331,7 +336,17 @@ public class ProjectController extends BaseController { @RequestMapping("/estimateEditSave") public String estimateEditSave(Project project, EstimateBean estimateBean, Map model) { Project projectInDb = projectService.getProject(project.getId()); - projectEstimateService.estimateEditSave(project, projectInDb, estimateBean, InterfaceUtil.getAdmin(), ApproveStatusEnum.APPROVAL_UNCOMMIT); + projectEstimateService.estimateEditSave(project, projectInDb, estimateBean, InterfaceUtil.getAdmin(), ApproveStatusEnum.APPROVAL_UNCOMMIT, StatusEnum.ESTIMATE_ACCOUNTS); + return "redirect:/project/list"; + } + + /** + * 编辑概算项目保存 + */ + @RequestMapping("/estimateEditSaveAfter") + public String estimateEditSaveAfter(Project project, EstimateBean estimateBean, Map model) { + Project projectInDb = projectService.getProject(project.getId()); + projectEstimateService.estimateEditSave(project, projectInDb, estimateBean, InterfaceUtil.getAdmin(), ApproveStatusEnum.APPROVAL_PASSED, StatusEnum.BUDGET_ACCOUNTS); return "redirect:/project/list"; } @@ -631,10 +646,10 @@ public class ProjectController extends BaseController { downloadHeader(httpServletResponse, Utils.generateExcelName("待我审核项目报表"), "application/octet-stream"); String[] headers = {"项目编号", "项目名称", "项目类型", "垫资模式", "垫资利息", "垫资峰值", "项目合同金额", "项目毛利", "项目毛利率", "项目把握度", "汇智产品金额", "华智产品金额", "华三产品金额", "其他产品金额", "项目当前状态", "行业场景应用", "解决方案", "客户名称", "最终用户名称", "预计合同签订时间", "项目计划招标时间", "是否二次合作", "直签", "战略合作对象", - "项目负责人", "价值及风险", "主合同收款条款", "主合同具体解决方案", "计收计划", "审核状态", "当前审核人", "项目创建者", "部门名称","项目阶段", "当前阶段描述", "下一步计划", "项目开始时间", "项目结束时间", "最后更新时间"}; + "项目负责人", "价值及风险", "主合同收款条款", "主合同具体解决方案", "计收计划", "审核状态", "当前审核人", "项目创建者", "部门名称","项目阶段", "公司销售阶段", "当前阶段描述", "下一步计划", "项目开始时间", "项目结束时间", "最后更新时间"}; String[] exportColumns = {"projectNo", "name", "typeDesc", "underwrittenModeStr", "advanceInterestAmountRound", "advancePeakAmountRound", "contractRound", "grossProfitRound", "grossProfitMarginRound", "certaintyStr", "huizhiRound", "huazhiRound", "huasanRound", "ziguangRound", "statusDesc", "industryScenario", "resolvePlanStr", "customer", "terminalCustomer", "contractTime", "bidsTime", "isSecondStr", "signTypeStr", "collaborator", - "principal", "valueRisk", "mainContractCollectionTerms", "mainContractResolvePlan", "calculationCollection", "approveStatusDesc", "approveName", "creatorName", "deptName", "stageName", "stageRemark", "nextPlan", "startDate","endDate", "lastUpdateTime"}; + "principal", "valueRisk", "mainContractCollectionTerms", "mainContractResolvePlan", "calculationCollection", "approveStatusDesc", "approveName", "creatorName", "deptName", "stageName", "saleStageName", "stageRemark", "nextPlan", "startDate","endDate", "lastUpdateTime"}; ExportUtils.exportToExcel(headers, exportColumns, 1, 10000, httpServletResponse.getOutputStream(), (pN, pS) -> projectService.findMyApproveProjects(searchInfo, InterfaceUtil.getAdminId(), pN, pS).getList()); } @@ -1165,10 +1180,10 @@ public class ProjectController extends BaseController { ExportExcelUtils exportExcelUtils = new ExportExcelUtils(); String[] headers0 = {"部门名称", "项目编号", "项目名称", "项目类型", "项目计划开始时间", "项目计划结束时间", "垫资模式", "合作对象", "垫资利息", "垫资峰值", "合同金额", "项目毛利", "项目毛利率", "华智产品金额", "汇智产品金额", "华三产品金额", "其他产品金额", "项目把握度", "行业场景应用", "项目解决方案", - "客户名称", "最终用户名称", "价值及风险", "项目负责人", "预计合同签订时间", "项目计划招标时间", "是否二次合作", "直签", "主合同收款条款", "主合同具体解决方案", "计收计划", "项目阶段", "当前进度描述", "下一步计划"}; + "客户名称", "最终用户名称", "价值及风险", "项目负责人", "预计合同签订时间", "项目计划招标时间", "是否二次合作", "直签", "主合同收款条款", "主合同具体解决方案", "计收计划", "项目阶段", "公司销售阶段", "当前进度描述", "下一步计划"}; String[] columns0 = {"deptName", "projectNo", "name", "typeDesc", "startDate", "endDate", "underwrittenModeStr", "collaborator", "advanceInterestAmountRound", "advancePeakAmountRound", "contractRound", "grossProfitRound", "grossProfitMarginRound", "huazhiRound", "huizhiRound", "huasanRound", "ziguangRound", "certaintyStr", "industryScenario", "resolvePlanStr", - "customer", "terminalCustomer", "valueRisk", "principal", "contractTime", "bidsTime", "isSecondStr", "signTypeStr", "mainContractCollectionTerms", "mainContractResolvePlan", "calculationCollection", "stageName", "stageRemark", "nextPlan"}; + "customer", "terminalCustomer", "valueRisk", "principal", "contractTime", "bidsTime", "isSecondStr", "signTypeStr", "mainContractCollectionTerms", "mainContractResolvePlan", "calculationCollection", "stageName", "saleStageName", "stageRemark", "nextPlan"}; exportExcelUtils.exportProjectExcel(headers0, columns0, project, "yyyy-MM-dd", 0, "项目立项（概算）信息", outputStream); exportExcelUtils.end(outputStream); diff --git a/src/main/java/cn/palmte/work/model/Project.java b/src/main/java/cn/palmte/work/model/Project.java index 3748154..3916a69 100644 --- a/src/main/java/cn/palmte/work/model/Project.java +++ b/src/main/java/cn/palmte/work/model/Project.java @@ -259,6 +259,9 @@ public class Project { @Column(name = "stage") private Integer stage; + @Column(name = "sale_stage") + private Integer saleStage; + @Column(name = "stage_remark") private String stageRemark; @@ -337,6 +340,9 @@ public class Project { @Transient private String stageName; + @Transient + private String saleStageName; + @Transient private String startDateStr; @@ -1112,4 +1118,20 @@ public class Project { public void setNextPlan(String nextPlan) { this.nextPlan = nextPlan; } + + public Integer getSaleStage() { + return saleStage; + } + + public void setSaleStage(Integer saleStage) { + this.saleStage = saleStage; + } + + public String getSaleStageName() { + return saleStageName; + } + + public void setSaleStageName(String saleStageName) { + this.saleStageName = saleStageName; + } } diff --git a/src/main/java/cn/palmte/work/service/ProjectEstimateService.java b/src/main/java/cn/palmte/work/service/ProjectEstimateService.java index 49aaf63..94101c7 100644 --- a/src/main/java/cn/palmte/work/service/ProjectEstimateService.java +++ b/src/main/java/cn/palmte/work/service/ProjectEstimateService.java @@ -296,7 +296,7 @@ public class ProjectEstimateService { Integer approveStatusEstimate = projectInDb.getApproveStatusEstimate(); - Project estimateProject = estimateEditSave(project, projectInDb, estimateBean, admin, ApproveStatusEnum.APPROVAL_PENDING); + Project estimateProject = estimateEditSave(project, projectInDb, estimateBean, admin, ApproveStatusEnum.APPROVAL_PENDING, StatusEnum.ESTIMATE_ACCOUNTS); projectBudgetSave(estimateProject); @@ -392,10 +392,10 @@ public class ProjectEstimateService { * 编辑概算保存项目 */ @Transactional(rollbackFor = RuntimeException.class) - public Project estimateEditSave(Project project, Project projectInDb, EstimateBean estimateBean, Admin admin, ApproveStatusEnum approveStatusEnum) { + public Project estimateEditSave(Project project, Project projectInDb, EstimateBean estimateBean, Admin admin, ApproveStatusEnum approveStatusEnum, StatusEnum statusEnum) { Project p = projectService.estimateEditProject(project, projectInDb); - p.setStatus(StatusEnum.ESTIMATE_ACCOUNTS.getStatus()); - p.setStatusDesc(StatusEnum.ESTIMATE_ACCOUNTS.getStatusDesc()); + p.setStatus(statusEnum.getStatus()); + p.setStatusDesc(statusEnum.getStatusDesc()); p.setApproveStatusEstimate(approveStatusEnum.getApproveStatus()); p = projectRepository.saveAndFlush(p); diff --git a/src/main/java/cn/palmte/work/service/ProjectService.java b/src/main/java/cn/palmte/work/service/ProjectService.java index c576097..9b95ecb 100644 --- a/src/main/java/cn/palmte/work/service/ProjectService.java +++ b/src/main/java/cn/palmte/work/service/ProjectService.java @@ -117,6 +117,9 @@ public class ProjectService { if (StrUtil.isNotEmpty(searchInfo.get("stage")) && !"-1".equals(searchInfo.get("stage"))) { queryHelper.addCondition("p.stage=?", Integer.parseInt(searchInfo.get("stage"))); } + if (StrUtil.isNotEmpty(searchInfo.get("saleStage")) && !"-1".equals(searchInfo.get("saleStage"))) { + queryHelper.addCondition("p.saleStage=?", Integer.parseInt(searchInfo.get("saleStage"))); + } if (StrUtil.isNotEmpty(searchInfo.get("isSecond")) && !"-1".equals(searchInfo.get("isSecond"))) { queryHelper.addCondition("p.is_second=?", Integer.parseInt(searchInfo.get("isSecond"))); } @@ -290,8 +293,10 @@ public class ProjectService { } if(null == project.getStage()){ project.setStageName(getStageName(-1)); + project.setSaleStageName(getSaleStageName(-1)); }else { project.setStageName(getStageName(project.getStage())); + project.setSaleStageName(getSaleStageName(project.getSaleStage())); } } } @@ -300,30 +305,54 @@ public class ProjectService { public String getStageName(int stage){ if(stage == 0){ - return "S0-概算立项"; + return "C0、项目可研"; }else if(stage == 1){ - return "S1-项目调研"; + return "C1、项目申报"; }else if(stage == 2){ - return "S2-方案设计"; + return "C2、项目设计"; }else if(stage == 3){ - return "S3-预算评估"; + return "C3、项目财评"; }else if(stage == 4){ - return "S4-招标期"; + return "C4、项目立项评审"; }else if(stage == 5){ - return "S5-合同期"; + return "C5、项目公示期"; }else if(stage == 6){ - return "S6-交付期"; + return "C6、项目合同期"; }else if(stage == 7){ - return "S7-结算期"; - }else if(stage == 8){ - return "S8-决算期"; - }else if(stage == 9){ - return "L-项目丢失"; + return "C7、项目结算期"; }else { return "无项目阶段"; } } + public String getSaleStageName(int stage){ + if(stage == 0){ + return "S0-商机线索"; + }else if(stage == 1){ + return "S1-需求摸索"; + }else if(stage == 2){ + return "S2-标前引导"; + }else if(stage == 3){ + return "S3-预算评审"; + }else if(stage == 4){ + return "S4-招投标期"; + }else if(stage == 5){ + return "S5-合同期"; + }else if(stage == 6){ + return "S6-交付期"; + }else if(stage == 7){ + return "S7-结算期"; + }else if(stage == 8){ + return "S8-决算期"; + }else if(stage == 9){ + return "L-项目丢单"; + }else if(stage == 10){ + return "S-暂停期"; + }else { + return "无公司销售阶段"; + } + } + /** * 找到待我审核项目 @@ -353,8 +382,10 @@ public class ProjectService { } if(null == project.getStage()){ project.setStageName(getStageName(-1)); + project.setSaleStageName(getSaleStageName(-1)); }else { project.setStageName(getStageName(project.getStage())); + project.setSaleStageName(getSaleStageName(project.getSaleStage())); } } } @@ -786,8 +817,10 @@ public class ProjectService { if(null == first.getStage()){ first.setStageName(getStageName(-1)); + first.setSaleStageName(getSaleStageName(-1)); }else { first.setStageName(getStageName(first.getStage())); + first.setSaleStageName(getSaleStageName(first.getSaleStage())); } return first; } @@ -955,6 +988,7 @@ public class ProjectService { public ResponseMsg stageRefreshSave(String json,int projectId) { JSONObject obj = JSON.parseObject(json); int stage = obj.getIntValue("stage"); + int saleStage = obj.getIntValue("saleStage"); String stageRemark = obj.getString("stageRemark"); String nextPlan = obj.getString("nextPlan"); @@ -964,6 +998,7 @@ public class ProjectService { } project.setStage(stage); + project.setSaleStage(saleStage); project.setStageRemark(stageRemark); project.setNextPlan(nextPlan); projectRepository.saveAndFlush(project); diff --git a/src/main/resources/application-dev.properties b/src/main/resources/application-dev.properties index 5446456..af259f3 100644 --- a/src/main/resources/application-dev.properties +++ b/src/main/resources/application-dev.properties @@ -1,7 +1,7 @@ spring.datasource.url=jdbc:mysql://192.168.1.100:3306/fourcal?\ characterEncoding=UTF8&zeroDateTimeBehavior=convertToNull&serverTimezone=GMT%2b8&rewriteBatchedStatements=true&nullCatalogMeansCurrent=true spring.datasource.username=root -spring.datasource.password=zytx123!@# +spring.datasource.password=Qwer123!@#$ spring.jpa.database-platform=org.hibernate.dialect.MySQLDialect #spring.jpa.properties.hibernate.hbm2ddl.auto=update diff --git a/src/main/resources/application-sit.properties b/src/main/resources/application-sit.properties index 03fa628..ed9445c 100644 --- a/src/main/resources/application-sit.properties +++ b/src/main/resources/application-sit.properties @@ -1,7 +1,7 @@ spring.datasource.url=jdbc:mysql://192.168.1.100:3306/fourcal?\ characterEncoding=UTF8&zeroDateTimeBehavior=convertToNull&serverTimezone=GMT%2b8&rewriteBatchedStatements=true&useSSL=false spring.datasource.username=root -spring.datasource.password=zytx123!@# +spring.datasource.password=Qwer123!@#$ spring.jpa.database-platform=org.hibernate.dialect.MySQLDialect #spring.jpa.properties.hibernate.hbm2ddl.auto=update diff --git a/src/main/resources/templates/admin/project_approve.ftl b/src/main/resources/templates/admin/project_approve.ftl index a2a327a..94d1614 100644 --- a/src/main/resources/templates/admin/project_approve.ftl +++ b/src/main/resources/templates/admin/project_approve.ftl @@ -409,28 +409,54 @@ 项目阶段: - + <#if project.stage??> <#if (project.stage) =0> - + <#elseif (project.stage) =1> - + <#elseif (project.stage) =2> - + <#elseif (project.stage) =3> - + <#elseif (project.stage) =4> - + <#elseif (project.stage) =5> - + <#elseif (project.stage) =6> - + <#elseif (project.stage) =7> + + + <#else> + + + + 公司销售阶段: + + <#if project.saleStage??> + <#if (project.saleStage) =0> + + <#elseif (project.saleStage) =1> + + <#elseif (project.saleStage) =2> + + <#elseif (project.saleStage) =3> + + <#elseif (project.saleStage) =4> + + <#elseif (project.saleStage) =5> + + <#elseif (project.saleStage) =6> + + <#elseif (project.saleStage) =7> - <#elseif (project.stage) =8> + <#elseif (project.saleStage) =8> - <#elseif (project.stage) =9> - + <#elseif (project.saleStage) =9> + + <#elseif (project.saleStage) =9> + <#else> diff --git a/src/main/resources/templates/admin/project_budget_edit.ftl b/src/main/resources/templates/admin/project_budget_edit.ftl index 1eecfed..3a19fc3 100644 --- a/src/main/resources/templates/admin/project_budget_edit.ftl +++ b/src/main/resources/templates/admin/project_budget_edit.ftl @@ -326,28 +326,54 @@ 项目阶段: - + <#if project.stage??> <#if (project.stage) =0> - + <#elseif (project.stage) =1> - + <#elseif (project.stage) =2> - + <#elseif (project.stage) =3> - + <#elseif (project.stage) =4> - + <#elseif (project.stage) =5> - + <#elseif (project.stage) =6> - + <#elseif (project.stage) =7> + + + <#else> + + + + 公司销售阶段: + + <#if project.saleStage??> + <#if (project.saleStage) =0> + + <#elseif (project.saleStage) =1> + + <#elseif (project.saleStage) =2> + + <#elseif (project.saleStage) =3> + + <#elseif (project.saleStage) =4> + + <#elseif (project.saleStage) =5> + + <#elseif (project.saleStage) =6> + + <#elseif (project.saleStage) =7> - <#elseif (project.stage) =8> + <#elseif (project.saleStage) =8> - <#elseif (project.stage) =9> - + <#elseif (project.saleStage) =9> + + <#elseif (project.saleStage) =9> + <#else> diff --git a/src/main/resources/templates/admin/project_estimate_add.ftl b/src/main/resources/templates/admin/project_estimate_add.ftl index e63ca86..d34f832 100644 --- a/src/main/resources/templates/admin/project_estimate_add.ftl +++ b/src/main/resources/templates/admin/project_estimate_add.ftl @@ -331,16 +331,32 @@ 项目阶段: + + + + 公司销售阶段: + + diff --git a/src/main/resources/templates/admin/project_estimate_edit.ftl b/src/main/resources/templates/admin/project_estimate_edit.ftl index e226d6d..c491aaf 100644 --- a/src/main/resources/templates/admin/project_estimate_edit.ftl +++ b/src/main/resources/templates/admin/project_estimate_edit.ftl @@ -378,16 +378,30 @@ 项目阶段: + + 公司销售阶段: + + @@ -656,8 +670,12 @@
+ <#if saveStage?? && saveStage=0> + <#elseif saveStage?? && saveStage=1> + +
@@ -725,6 +743,21 @@ $("#pmsForm").attr("action","${base}/project/estimateEditSave"); $("#pmsForm").submit(); }); + $("#saveDraftAfter").click(function () { + $("#collaboratorUrl").val($("#collaboratorUrl_span").text()); + check = 0; + $("#saveDraftAfter").attr('disabled',true); + // checkIfFillIn(); + if (check == 1) { + $("#saveDraftAfter").attr('disabled', false); + return; + } + setTimeout(function () { + $("#saveDraftAfter").attr('disabled', false); + }, 5000); + $("#pmsForm").attr("action","${base}/project/estimateEditSaveAfter"); + $("#pmsForm").submit(); + }); $("#saveApprove").click(function () { $("#collaboratorUrl").val($("#collaboratorUrl_span").text()); diff --git a/src/main/resources/templates/admin/project_list.ftl b/src/main/resources/templates/admin/project_list.ftl index ef231f9..63240c4 100644 --- a/src/main/resources/templates/admin/project_list.ftl +++ b/src/main/resources/templates/admin/project_list.ftl @@ -518,16 +518,33 @@
+
+ +
+
公司销售阶段
+
+
@@ -863,6 +880,7 @@ 项目名称style="color: red" onclick="sub_function('projectNameDown')">style="color: red" onclick="sub_function('projectNameUp')"> 项目类型style="color: red" onclick="sub_function('projectTypeDown')">style="color: red" onclick="sub_function('projectTypeUp')"> 项目阶段 + 公司销售阶段 <#--垫资模式style="color: red" onclick="sub_function('underModeDown')">style="color: red" onclick="sub_function('underModeUp')">--> <#--垫资利息style="color: red" onclick="sub_function('underIntDown')">style="color: red" onclick="sub_function('underIntUp')">--> <#--垫资峰值style="color: red" onclick="sub_function('underPeakDown')">style="color: red" onclick="sub_function('underPeakUp')">--> @@ -914,20 +932,36 @@ <#--项目阶段--> <#if list.stage??> - <#if list.stage==0>S0-概算立项 - <#elseif list.stage==1>S1-项目调研 - <#elseif list.stage==2>S2-方案设计 - <#elseif list.stage==3>S3-预算评估 - <#elseif list.stage==4>S4-招标期 - <#elseif list.stage==5>S5-合同期 - <#elseif list.stage==6>S6-交付期 - <#elseif list.stage==7>S7-结算期 - <#elseif list.stage==8>S8-决算期 - <#elseif list.stage==9>L-项目丢失 + <#if list.stage==0>C0、项目可研 + <#elseif list.stage==1>C1、项目申报 + <#elseif list.stage==2>C2、项目设计 + <#elseif list.stage==3>C3、项目财评 + <#elseif list.stage==4>C4、项目立项评审 + <#elseif list.stage==5>C5、项目公示期 + <#elseif list.stage==6>C6、项目合同期 + <#elseif list.stage==7>C7、项目结算期 <#else> + <#--公司销售阶段--> + + <#if list.saleStage??> + <#if list.saleStage==0>S0-商机线索 + <#elseif list.saleStage==1>S1-需求摸索 + <#elseif list.saleStage==2>S2-标前引导 + <#elseif list.saleStage==3>S3-预算评审 + <#elseif list.saleStage==4>S4-招投标期 + <#elseif list.saleStage==5>S5-合同期 + <#elseif list.saleStage==6>S6-交付期 + <#elseif list.saleStage==7>S7-结算期 + <#elseif list.saleStage==8>S8-决算期 + <#elseif list.saleStage==9>L-项目丢单 + <#elseif list.saleStage==10>S-暂停期 + + <#else> + + <#--垫资模式--> <#--${list.underwrittenModeStr!}--> <#--垫资利息--> @@ -1018,7 +1052,7 @@ <#--<@shiro.hasPermission name="PROJECT_EDIT">--> <#-- 项目等于概算状态、概算审核为草稿和不通过状态--> - <#if list.creatorId==adminId && list.status==1 && (list.approveStatusEstimate==0 || list.approveStatusEstimate==3)> + <#if list.creatorId==adminId && list.status=1 && (list.approveStatusEstimate==0 || list.approveStatusEstimate==3)> + + <#-- 项目等于概算状态、概算审核为草稿状态--> <#if list.creatorId==adminId && list.status==1 && list.approveStatusEstimate==0>