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 db337fe..9624f1b 100644 --- a/src/main/java/cn/palmte/work/controller/backend/ProjectController.java +++ b/src/main/java/cn/palmte/work/controller/backend/ProjectController.java @@ -4,7 +4,6 @@ import cn.palmte.work.bean.*; import cn.palmte.work.model.*; import cn.palmte.work.pojo.ActHisTask; import cn.palmte.work.service.*; -import cn.palmte.work.utils.DateKit; import cn.palmte.work.utils.FreeMarkerUtil; import cn.palmte.work.utils.InterfaceUtil; import cn.palmte.work.utils.Utils; @@ -24,7 +23,9 @@ import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletResponse; import java.io.IOException; -import java.util.*; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; import java.util.concurrent.ConcurrentHashMap; /** @@ -65,6 +66,8 @@ public class ProjectController extends BaseController { private ProcurementTypeService procurementTypeService; @Autowired private ProjectSettleIncomeRepository projectSettleIncomeRepository; + @Autowired + private ProjectRepository projectRepository; /** * 项目列表 @@ -525,4 +528,17 @@ public class ProjectController extends BaseController { public void initBinder(WebDataBinder webDataBinder) { webDataBinder.addCustomFormatter(new DateFormatter("yyyy-MM-dd")); } + + /** + * 保存项目与用户的关系 + */ + @RequestMapping("/checkName") + @ResponseBody + public ResponseMsg checkName(@RequestParam String name) { + Project project = projectRepository.findByProjectName(name); + if (project != null) { + return ResponseMsg.buildFailedMsg("失败"); + } + return ResponseMsg.buildSuccessMsg("成功"); + } } diff --git a/src/main/java/cn/palmte/work/service/AccountService.java b/src/main/java/cn/palmte/work/service/AccountService.java index f4b2506..097bffc 100644 --- a/src/main/java/cn/palmte/work/service/AccountService.java +++ b/src/main/java/cn/palmte/work/service/AccountService.java @@ -6,7 +6,6 @@ import cn.palmte.work.model.*; import cn.palmte.work.utils.DESCrypto; import cn.palmte.work.utils.InterfaceUtil; import cn.palmte.work.utils.StrKit; -import cn.palmte.work.utils.excel.ExportUtils; import org.apache.commons.lang.RandomStringUtils; import org.apache.commons.lang.StringUtils; import org.slf4j.Logger; @@ -20,12 +19,8 @@ import top.jfunc.common.db.bean.Page; import top.jfunc.common.db.bean.Record; import top.jfunc.common.db.utils.Pagination; -import javax.servlet.http.HttpServletResponse; import java.beans.Transient; -import java.io.IOException; import java.util.*; -import java.util.concurrent.ConcurrentHashMap; -import java.util.stream.Collectors; /** * Created by wang.lin@esstx.cn on 2018/4/20. @@ -63,6 +58,7 @@ public class AccountService { public Page list(Map searchInfo, int pageNumber, int pageSize) { QueryHelper queryHelper = new QueryHelper("*", "sys_user u"); queryHelper.addCondition("u.is_deleted = 0"); + queryHelper.addCondition("u.id > 1"); queryHelper.addCondition(searchInfo.containsKey("realName"), "u.real_name like ?", "%" + searchInfo.get("realName") + "%"); queryHelper.addCondition(searchInfo.containsKey("telephone"), "u.telephone =?", searchInfo.get("telephone")); diff --git a/src/main/resources/static/assets/js/project_budget.js b/src/main/resources/static/assets/js/project_budget.js index f86f10e..27db46a 100644 --- a/src/main/resources/static/assets/js/project_budget.js +++ b/src/main/resources/static/assets/js/project_budget.js @@ -6,9 +6,11 @@ $(function () { bindChangeableInput(); $("#saveDraft").click(function () { + $("#saveDraft").attr('disabled',true); var message = verifyProjectContributionProfitRate(); if (message) { + $("#saveDraft").attr('disabled',false); layuiAlert(message); return ; } @@ -17,17 +19,21 @@ $(function () { var startTime = $("#startDate").val(); var endTime = $("#endDate").val(); if (startTime > endTime) { + $("#saveDraft").attr('disabled',false); window.confirm('开始日期应早于结束日期'); return; } $("#pmsForm").attr("action",base+"/project/budgetEditSave"); $("#pmsForm").submit(); + $("#saveDraft").attr('disabled',false); }); $("#saveApprove").click(function () { + $("#saveApprove").attr('disabled',true); var message = verifyProjectContributionProfitRate(); if (message) { + $("#saveApprove").attr('disabled',false); layuiAlert(message); return; } @@ -35,12 +41,14 @@ $(function () { var startTime = $("#startDate").val(); var endTime = $("#endDate").val(); if (startTime > endTime) { + $("#saveApprove").attr('disabled',false); window.confirm('开始日期应早于结束日期'); return; } $("#pmsForm").attr("action",base+"/project/budgetEditSaveAndApprove"); $("#pmsForm").submit(); + $("#saveApprove").attr('disabled',false); }); }); diff --git a/src/main/resources/templates/admin/project_estimate_add.ftl b/src/main/resources/templates/admin/project_estimate_add.ftl index ea805a8..3b25f81 100644 --- a/src/main/resources/templates/admin/project_estimate_add.ftl +++ b/src/main/resources/templates/admin/project_estimate_add.ftl @@ -60,7 +60,7 @@
*项目名称
-
@@ -331,30 +331,62 @@ diff --git a/src/main/resources/templates/admin/project_final_add.ftl b/src/main/resources/templates/admin/project_final_add.ftl index 253a4d9..9e919b2 100644 --- a/src/main/resources/templates/admin/project_final_add.ftl +++ b/src/main/resources/templates/admin/project_final_add.ftl @@ -365,13 +365,17 @@ $(function () { calculateFinal(); $("#saveFinal").click(function () { + $("#saveFinal").attr('disabled',true); $("#pmsForm").attr("action","${base}/project/final/save"); $("#pmsForm").submit(); + $("#saveFinal").attr('disabled',false); }); $("#saveApprove").click(function () { + $("#saveApprove").attr('disabled',true); $("#pmsForm").attr("action",base+"/project/final/saveAndApprove"); $("#pmsForm").submit(); + $("#saveApprove").attr('disabled',false); }); }); diff --git a/src/main/resources/templates/admin/project_settle_add.ftl b/src/main/resources/templates/admin/project_settle_add.ftl index 40fd352..df8b916 100644 --- a/src/main/resources/templates/admin/project_settle_add.ftl +++ b/src/main/resources/templates/admin/project_settle_add.ftl @@ -426,23 +426,29 @@ calculateSettle(); $("#saveSettle").click(function () { + $("#saveSettle").attr('disabled',true); var result = valid(); console.log(result); if (result) { console.log("result: " + result); $("#pmsForm").attr("action", "${base}/project/settle/save"); $("#pmsForm").submit(); + $("#saveSettle").attr('disabled',false); } else { + $("#saveSettle").attr('disabled',false); return false; } }); $("#saveApprove").click(function () { + $("#saveApprove").attr('disabled',true); var result = valid(); if (result) { $("#pmsForm").attr("action",base+"/project/settle/saveAndApprove"); $("#pmsForm").submit(); + $("#saveApprove").attr('disabled',false); } else { + $("#saveApprove").attr('disabled',false); return false; } });