From f19299f3a94225318339c82bba1ef55812579da9 Mon Sep 17 00:00:00 2001
From: hanbo <2608504783@qq.com>
Date: Wed, 8 Dec 2021 17:37:57 +0800
Subject: [PATCH 1/4] =?UTF-8?q?=E4=BF=9D=E5=AD=98=E9=A2=84=E7=AE=97?=
 =?UTF-8?q?=E8=A1=A8=E6=97=A5=E6=9C=9F=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/static/assets/js/project_budget.js   | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/src/main/resources/static/assets/js/project_budget.js b/src/main/resources/static/assets/js/project_budget.js
index 466adb4..2b629fc 100644
--- a/src/main/resources/static/assets/js/project_budget.js
+++ b/src/main/resources/static/assets/js/project_budget.js
@@ -14,6 +14,13 @@ $(function () {
         }
         console.log(message);
 
+        var startTime = $("#startDate").val();
+        var endTime = $("#endDate").val();
+        if (startTime > endTime) {
+            window.confirm('开始日期应早于结束日期');
+            return;
+        }
+
         $("#pmsForm").attr("action",base+"/project/budgetEditSave");
         $("#pmsForm").submit();
     });
@@ -25,6 +32,13 @@ $(function () {
             return;
         }
 
+        var startTime = $("#startDate").val();
+        var endTime = $("#endDate").val();
+        if (startTime > endTime) {
+            window.confirm('开始日期应早于结束日期');
+            return;
+        }
+
         $("#pmsForm").attr("action",base+"/project/budgetEditSaveAndApprove");
         $("#pmsForm").submit();
     });

From 58fd856c9ce80515c3cae7d3230416a7dd11fcc9 Mon Sep 17 00:00:00 2001
From: hanbo <2608504783@qq.com>
Date: Wed, 8 Dec 2021 18:33:24 +0800
Subject: [PATCH 2/4] =?UTF-8?q?=E4=BF=9D=E5=AD=98=E9=A1=B9=E7=9B=AE?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86=E6=88=90=E6=9C=AC=E6=98=8E=E7=BB=86=E8=A1=A8?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/resources/templates/admin/project_budget_edit.ftl | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main/resources/templates/admin/project_budget_edit.ftl b/src/main/resources/templates/admin/project_budget_edit.ftl
index 22764d8..55d72ce 100644
--- a/src/main/resources/templates/admin/project_budget_edit.ftl
+++ b/src/main/resources/templates/admin/project_budget_edit.ftl
@@ -569,11 +569,11 @@
                                     </select>-->
                                     <#if costProjectManageDetail.deletable==0>
                                         <#if costProjectManageDetail.type ==1 >
-                                            <input style="width: 80px;float: left;" readonly type="text" class="am-modal-prompt-input am-modal-prompt-input-cost-project-manage" value="人工成本">
+                                            <input style="visibility: hidden;" readonly type="text" class="am-modal-prompt-input am-modal-prompt-input-cost-project-manage" value="1">人工成本
                                         <#elseif costProjectManageDetail.type  ==2>
-                                            <input style="width: 80px;float: left;" readonly type="text" class="am-modal-prompt-input am-modal-prompt-input-cost-project-manage" value="业务费用">
+                                            <input style="visibility: hidden;" readonly type="text" class="am-modal-prompt-input am-modal-prompt-input-cost-project-manage" value="2">业务费用
                                         <#elseif costProjectManageDetail.type  ==3>
-                                            <input style="width: 80px;float: left;" readonly type="text" class="am-modal-prompt-input am-modal-prompt-input-cost-project-manage" value="其他费用">
+                                            <input style="visibility: hidden;" readonly type="text" class="am-modal-prompt-input am-modal-prompt-input-cost-project-manage" value="3">其他费用
                                         </#if>
                                         <#elseif costProjectManageDetail.deletable!=0>
                                             <select style="width: 80px;float: left;" class="am-modal-prompt-input am-modal-prompt-input-cost-project-manage">

From 8517d01f8ee3024da30ef92059e02d1d4751368c Mon Sep 17 00:00:00 2001
From: hanbo <2608504783@qq.com>
Date: Wed, 8 Dec 2021 18:37:59 +0800
Subject: [PATCH 3/4] =?UTF-8?q?=E4=BF=9D=E5=AD=98=E9=A1=B9=E7=9B=AE?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86=E6=88=90=E6=9C=AC=E6=98=8E=E7=BB=86=E8=A1=A8?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/resources/templates/admin/project_budget_edit.ftl | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main/resources/templates/admin/project_budget_edit.ftl b/src/main/resources/templates/admin/project_budget_edit.ftl
index 55d72ce..06b2e13 100644
--- a/src/main/resources/templates/admin/project_budget_edit.ftl
+++ b/src/main/resources/templates/admin/project_budget_edit.ftl
@@ -569,11 +569,11 @@
                                     </select>-->
                                     <#if costProjectManageDetail.deletable==0>
                                         <#if costProjectManageDetail.type ==1 >
-                                            <input style="visibility: hidden;" readonly type="text" class="am-modal-prompt-input am-modal-prompt-input-cost-project-manage" value="1">人工成本
+                                            <input readonly type="hidden" class="am-modal-prompt-input am-modal-prompt-input-cost-project-manage" value="1">人工成本
                                         <#elseif costProjectManageDetail.type  ==2>
-                                            <input style="visibility: hidden;" readonly type="text" class="am-modal-prompt-input am-modal-prompt-input-cost-project-manage" value="2">业务费用
+                                            <input readonly type="hidden" class="am-modal-prompt-input am-modal-prompt-input-cost-project-manage" value="2">业务费用
                                         <#elseif costProjectManageDetail.type  ==3>
-                                            <input style="visibility: hidden;" readonly type="text" class="am-modal-prompt-input am-modal-prompt-input-cost-project-manage" value="3">其他费用
+                                            <input readonly type="hidden" class="am-modal-prompt-input am-modal-prompt-input-cost-project-manage" value="3">其他费用
                                         </#if>
                                         <#elseif costProjectManageDetail.deletable!=0>
                                             <select style="width: 80px;float: left;" class="am-modal-prompt-input am-modal-prompt-input-cost-project-manage">

From 101163731e1b869007302e57e826a1ba2d7e01b3 Mon Sep 17 00:00:00 2001
From: OathK1per <zhangypg@gmail.com>
Date: Thu, 9 Dec 2021 10:36:54 +0800
Subject: [PATCH 4/4] =?UTF-8?q?=E4=BA=BA=E5=8A=9B=E6=88=90=E6=9C=AC?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86=E5=AF=BC=E5=85=A5=E6=9D=83=E9=99=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/cn/palmte/work/service/HumanCostService.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/cn/palmte/work/service/HumanCostService.java b/src/main/java/cn/palmte/work/service/HumanCostService.java
index 8362abf..aa178ba 100644
--- a/src/main/java/cn/palmte/work/service/HumanCostService.java
+++ b/src/main/java/cn/palmte/work/service/HumanCostService.java
@@ -260,7 +260,7 @@ public class HumanCostService {
             int roleId = admin.getRoleId();
             Integer adminId = admin.getId();
             //自己创建的肯定能看见
-            projectList = pagination.find(sql, Project.class, Project.STATUS_SETTLE, Project.STATUS_BUDGET, 2, adminId, roleId, adminId);
+            projectList = pagination.find(sql, Project.class, Project.STATUS_SETTLE, Project.STATUS_BUDGET, 2, Project.STATUS_FINAL, 2, adminId, roleId, adminId);
         }
         for (Project project : projectList) {
             data.add(project.getName());