项目新增日期精确到天
parent
ec52a75202
commit
f49921817c
|
@ -521,6 +521,6 @@ public class ProjectController extends BaseController {
|
||||||
|
|
||||||
@InitBinder
|
@InitBinder
|
||||||
public void initBinder(WebDataBinder webDataBinder) {
|
public void initBinder(WebDataBinder webDataBinder) {
|
||||||
webDataBinder.addCustomFormatter(new DateFormatter("yyyy-MM"));
|
webDataBinder.addCustomFormatter(new DateFormatter("yyyy-MM-dd"));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -131,14 +131,14 @@
|
||||||
<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">
|
||||||
<span>${project.startDate?string("yyyy-MM")}</span>
|
<span>${project.startDate?string("yyyy-MM-dd")}</span>
|
||||||
</div>
|
</div>
|
||||||
<div class="am-u-sm-2 am-u-md-4 input-msg"></div>
|
<div class="am-u-sm-2 am-u-md-4 input-msg"></div>
|
||||||
</div>
|
</div>
|
||||||
<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">
|
||||||
<span>${project.endDate?string("yyyy-MM")}</span>
|
<span>${project.endDate?string("yyyy-MM-dd")}</span>
|
||||||
</div>
|
</div>
|
||||||
<div class="am-u-sm-2 am-u-md-4 input-msg"></div>
|
<div class="am-u-sm-2 am-u-md-4 input-msg"></div>
|
||||||
</div>
|
</div>
|
||||||
|
@ -1128,7 +1128,7 @@
|
||||||
<td>合计</td>
|
<td>合计</td>
|
||||||
<td></td>
|
<td></td>
|
||||||
<td></td>
|
<td></td>
|
||||||
<td><input name="incomeTotalTaxExclude" value="${Utils.format(estimateBean.getIncomeTotalTaxExclude(),'0')}" type="number" readonly required title="此列累计"></td>
|
<td><input name="incomeTotalTaxExclude" value="${Utils.format(estimateBean.getCostTotalTaxExclude(),'0')}" type="number" readonly required title="此列累计"></td>
|
||||||
<td><input name="costTotalTaxExclude" value="${Utils.format(budgetBean.getCostTotalTaxExclude(),'0')}" type="number" readonly required title="此列累计"></td>
|
<td><input name="costTotalTaxExclude" value="${Utils.format(budgetBean.getCostTotalTaxExclude(),'0')}" type="number" readonly required title="此列累计"></td>
|
||||||
<td><input name="costSettleTotal" value="${Utils.format(currentBean.getCostTotalTaxExclude(),'0')}" type="number" readonly required title="此列累计"></td>
|
<td><input name="costSettleTotal" value="${Utils.format(currentBean.getCostTotalTaxExclude(),'0')}" type="number" readonly required title="此列累计"></td>
|
||||||
<td><input name="costFinalTotal" type="number" value="${Utils.format(finalBean.getCostTotal(),'0')}" readonly required title="此列累计"></td>
|
<td><input name="costFinalTotal" type="number" value="${Utils.format(finalBean.getCostTotal(),'0')}" readonly required title="此列累计"></td>
|
||||||
|
|
|
@ -42,7 +42,7 @@
|
||||||
<i class="am-icon-calendar"></i>
|
<i class="am-icon-calendar"></i>
|
||||||
<input type="text" class="am-form-field am-input-sm" id="startDate"
|
<input type="text" class="am-form-field am-input-sm" id="startDate"
|
||||||
name="startDate" autocomplete="off"
|
name="startDate" autocomplete="off"
|
||||||
value="${project.startDate?string("yyyy-MM")}" placeholder="项目计划开始时间"
|
value="${project.startDate?string("yyyy-MM-dd")}" placeholder="项目计划开始时间"
|
||||||
data-am-datepicker>
|
data-am-datepicker>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
@ -55,7 +55,7 @@
|
||||||
<i class="am-icon-calendar"></i>
|
<i class="am-icon-calendar"></i>
|
||||||
<input type="text" class="am-form-field am-input-sm" id="endDate"
|
<input type="text" class="am-form-field am-input-sm" id="endDate"
|
||||||
name="endDate" autocomplete="off"
|
name="endDate" autocomplete="off"
|
||||||
value="${project.endDate?string("yyyy-MM")}" placeholder="项目计划结束时间"
|
value="${project.endDate?string("yyyy-MM-dd")}" placeholder="项目计划结束时间"
|
||||||
data-am-datepicker>
|
data-am-datepicker>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
Loading…
Reference in New Issue