优化展示

src/main/java/cn/palmte/work/service/ProjectService.java

@@ -197,6 +197,8 @@ public class ProjectService {
         projectInDb.setValueRisk(project.getValueRisk());
         projectInDb.setOtherName(project.getOtherName());
 
+        projectInDb.setPlanStartStr(project.getPlanStartStr());
+        projectInDb.setPlanEndStr(project.getPlanEndStr());
         /// projectInDb.setApproveStatusEstimate(approveStatusEnum.getApproveStatus());
 
         projectInDb.setLastUpdateTime(new Date());

src/main/resources/static/assets/js/project_budget.js

@@ -338,9 +338,6 @@ function arr2ObjectVerify(line, arr, detailPropertyArr, detailProperty) {
         var o = detailProperty[detailPropertyArr[i]];
         //空但是要求非空
         if (!arr[i] && o[0]) {
-            if (i === detailPropertyArr.length - 1 && detailProperty !== BUDGET_PLAN_DETAIL) {
-                continue;
-            }
             layuiAlert("第 " + (line + 1) + " 行的 " + o[1] + " 不允许为空");
             return null;
         }
@@ -362,9 +359,6 @@ function arr2ObjectVerifyCheck(line, arr, detailPropertyArr, detailProperty, s)
         var o = detailProperty[detailPropertyArr[i]];
         //空但是要求非空
         if (!arr[i] && o[0]) {
-            if (i === detailPropertyArr.length - 1 && s !== "项目资金计划表") {
-                continue;
-            }
             layuiAlert(s + "第 " + (line + 1) + " 行的 " + o[1] + " 不允许为空");
             return null;
         }
@@ -423,6 +417,9 @@ function convertDetailVerify(data, detailProperty) {
     var arr = arrayToMatrix(data, detailPropertyArr.length);
     var details = [];
     for (var i = 0; i < arr.length; i++) {
+        if (i === arr.length - 1 && detailProperty !== BUDGET_PLAN_DETAIL) {
+            continue;
+        }
         var obj = arr2ObjectVerify(i, arr[i], detailPropertyArr, detailProperty);
         if (!obj) {
             return null;
@@ -438,6 +435,9 @@ function convertDetailVerifyCheck(data, detailProperty, s) {
     var arr = arrayToMatrix(data, detailPropertyArr.length);
     var details = [];
     for (var i = 0; i < arr.length; i++) {
+        if (i === arr.length - 1 && s !== "项目资金计划表") {
+            continue;
+        }
         var obj = arr2ObjectVerifyCheck(i, arr[i], detailPropertyArr, detailProperty, s);
         if (!obj) {
             return null;

src/main/resources/static/assets/js/project_budget_plan.js

@@ -317,7 +317,7 @@ function verifyBudgetPlan(){
     var planStartStr = $("#planStartStr").val();
     var planEndStr = $("#planEndStr").val();
     if (planStartStr === "" || planEndStr === "") {
-        return "请跳入资金计划表中的开始时间和结束时间";
+        return "请选择资金计划表中的开始时间和结束时间";
     }
 
     var costPurchaseDeviceTaxInclude = inputVal("costPurchaseDeviceTaxInclude");

src/main/resources/templates/admin/project_budget_edit.ftl

@@ -614,6 +614,7 @@
                                 <div class="am-form-group am-form-icon">
                                     <input type="text" id="planEndStr" name="planEndStr" placeholder="结束日期(请选择)" autocomplete="off" readonly value="${planEndStr!}">
                                 </div>
+                                <div class="am-form-group">必填</div>
                             </div>
                         </div>
                     </td>