mula
/
fourcal
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

master
OathK1per 2022-04-18 17:32:19 +08:00
parent 7521eff73d 5d411a62a5
commit de7e5a7910
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/cn/palmte/work/controller/backend/ProjectController.java
View File

@ -113,7 +113,7 @@ public class ProjectController extends BaseController {
public String add(Map<String, Object> model) { public String add(Map<String, Object> model) {
Dept one = deptService.findUserDept(InterfaceUtil.getAdmin()); Dept one = deptService.findUserDept(InterfaceUtil.getAdmin());
model.put("dept", one); model.put("dept", one);
model.put("projectId",-1);
return "admin/project_estimate_add"; return "admin/project_estimate_add";
} }

6
src/main/resources/templates/admin/project_estimate_add.ftl
View File

@ -18,7 +18,7 @@
<div class="am-tab-panel am-fade am-in am-active" id="tab1"> <div class="am-tab-panel am-fade am-in am-active" id="tab1">
<#--<input name="permissionID" id="permissionID" type="hidden" value="${permissionID!}" />--> <#--<input name="permissionID" id="permissionID" type="hidden" value="${permissionID!}" />-->
<!--验证表单元素（validate) begin--> <!--验证表单元素（validate) begin-->
<input name="id" id="id" type="hidden" value="${projectId}" />
<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">
@ -444,6 +444,7 @@
$(function () { $(function () {
calIncomeAndCost(); calIncomeAndCost();
$("#saveDraft").click(function () { $("#saveDraft").click(function () {
check = 0;
$("#saveDraft").attr('disabled',true); $("#saveDraft").attr('disabled',true);
checkIfFillIn(); checkIfFillIn();
if (check == 1) { if (check == 1) {
@ -458,10 +459,11 @@
}); });
$("#saveApprove").click(function () { $("#saveApprove").click(function () {
check = 0;
$("#saveApprove").attr('disabled',true); $("#saveApprove").attr('disabled',true);
checkIfFillIn(); checkIfFillIn();
if (check == 1) { if (check == 1) {
$("#saveDraft").attr('disabled', false); $("#saveApprove").attr('disabled', false);
return; return;
} }
setTimeout(function () { setTimeout(function () {