项目不可重名
parent
7881488d50
commit
bcae5ea321
|
@ -4,7 +4,6 @@ import cn.palmte.work.bean.*;
|
||||||
import cn.palmte.work.model.*;
|
import cn.palmte.work.model.*;
|
||||||
import cn.palmte.work.pojo.ActHisTask;
|
import cn.palmte.work.pojo.ActHisTask;
|
||||||
import cn.palmte.work.service.*;
|
import cn.palmte.work.service.*;
|
||||||
import cn.palmte.work.utils.DateKit;
|
|
||||||
import cn.palmte.work.utils.FreeMarkerUtil;
|
import cn.palmte.work.utils.FreeMarkerUtil;
|
||||||
import cn.palmte.work.utils.InterfaceUtil;
|
import cn.palmte.work.utils.InterfaceUtil;
|
||||||
import cn.palmte.work.utils.Utils;
|
import cn.palmte.work.utils.Utils;
|
||||||
|
@ -24,7 +23,9 @@ import org.springframework.web.bind.annotation.*;
|
||||||
|
|
||||||
import javax.servlet.http.HttpServletResponse;
|
import javax.servlet.http.HttpServletResponse;
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
import java.util.*;
|
import java.util.ArrayList;
|
||||||
|
import java.util.List;
|
||||||
|
import java.util.Map;
|
||||||
import java.util.concurrent.ConcurrentHashMap;
|
import java.util.concurrent.ConcurrentHashMap;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -65,6 +66,8 @@ public class ProjectController extends BaseController {
|
||||||
private ProcurementTypeService procurementTypeService;
|
private ProcurementTypeService procurementTypeService;
|
||||||
@Autowired
|
@Autowired
|
||||||
private ProjectSettleIncomeRepository projectSettleIncomeRepository;
|
private ProjectSettleIncomeRepository projectSettleIncomeRepository;
|
||||||
|
@Autowired
|
||||||
|
private ProjectRepository projectRepository;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 项目列表
|
* 项目列表
|
||||||
|
@ -525,4 +528,17 @@ public class ProjectController extends BaseController {
|
||||||
public void initBinder(WebDataBinder webDataBinder) {
|
public void initBinder(WebDataBinder webDataBinder) {
|
||||||
webDataBinder.addCustomFormatter(new DateFormatter("yyyy-MM-dd"));
|
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("成功");
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -60,7 +60,7 @@
|
||||||
<div class="am-g am-form-group am-margin-top">
|
<div class="am-g am-form-group am-margin-top">
|
||||||
<div class="am-u-sm-4 am-u-md-2 am-text-right"><span style="color: red;">*</span>项目名称</div>
|
<div class="am-u-sm-4 am-u-md-2 am-text-right"><span style="color: red;">*</span>项目名称</div>
|
||||||
<div class="am-u-sm-6 am-u-md-6">
|
<div class="am-u-sm-6 am-u-md-6">
|
||||||
<input type="text" class="am-input" data-validate-async data-validation-message="请输入项目名称(20字符以内)"
|
<input type="text" id="name" class="am-input" data-validate-async data-validation-message="请输入项目名称(20字符以内)"
|
||||||
name="name" placeholder="请输入项目名称(20字符以内)" maxlength="20"
|
name="name" placeholder="请输入项目名称(20字符以内)" maxlength="20"
|
||||||
value="" required />
|
value="" required />
|
||||||
</div>
|
</div>
|
||||||
|
@ -331,6 +331,7 @@
|
||||||
<script src="${base}/assets/js/project_common.js"></script>
|
<script src="${base}/assets/js/project_common.js"></script>
|
||||||
<script src="${base}/assets/js/project_estimate.js"></script>
|
<script src="${base}/assets/js/project_estimate.js"></script>
|
||||||
<script>
|
<script>
|
||||||
|
var result = 0;
|
||||||
$(function () {
|
$(function () {
|
||||||
calIncomeAndCost();
|
calIncomeAndCost();
|
||||||
$("#saveDraft").click(function () {
|
$("#saveDraft").click(function () {
|
||||||
|
@ -342,6 +343,12 @@
|
||||||
window.confirm('开始日期应早于结束日期');
|
window.confirm('开始日期应早于结束日期');
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
checkName();
|
||||||
|
if (result == 1) {
|
||||||
|
$("#saveDraft").attr('disabled',false);
|
||||||
|
window.confirm('项目名称已存在');
|
||||||
|
return;
|
||||||
|
}
|
||||||
$("#pmsForm").attr("action","${base}/project/estimateAddSave");
|
$("#pmsForm").attr("action","${base}/project/estimateAddSave");
|
||||||
$("#pmsForm").submit();
|
$("#pmsForm").submit();
|
||||||
$("#saveDraft").attr('disabled',false);
|
$("#saveDraft").attr('disabled',false);
|
||||||
|
@ -355,12 +362,31 @@
|
||||||
window.confirm('开始日期应早于结束日期');
|
window.confirm('开始日期应早于结束日期');
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
checkName();
|
||||||
|
if (result == 1) {
|
||||||
|
$("#saveApprove").attr('disabled',false);
|
||||||
|
window.confirm('项目名称已存在');
|
||||||
|
return;
|
||||||
|
}
|
||||||
$("#pmsForm").attr("action","${base}/project/estimateAddSaveAndApprove");
|
$("#pmsForm").attr("action","${base}/project/estimateAddSaveAndApprove");
|
||||||
$("#pmsForm").submit();
|
$("#pmsForm").submit();
|
||||||
$("#saveApprove").attr('disabled',false);
|
$("#saveApprove").attr('disabled',false);
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
|
function checkName () {
|
||||||
|
var name = $("#name").val();
|
||||||
|
$.ajax({
|
||||||
|
url: "${base}/project/checkName",
|
||||||
|
data: {name: name},
|
||||||
|
type: "post",
|
||||||
|
dataType: "json",
|
||||||
|
async: false,
|
||||||
|
success: function (data) {
|
||||||
|
result = data.status;
|
||||||
|
}
|
||||||
|
});
|
||||||
|
};
|
||||||
</script>
|
</script>
|
||||||
</@defaultLayout.layout>
|
</@defaultLayout.layout>
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue