From b31e862a6fef6caee402d044f223198882cbcd95 Mon Sep 17 00:00:00 2001
From: hanbo <2608504783@qq.com>
Date: Mon, 18 Apr 2022 16:03:07 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E6=98=93=E7=94=A8=E6=80=A7=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cn/palmte/work/controller/backend/ProjectController.java  | 2 +-
 src/main/resources/templates/admin/project_estimate_add.ftl   | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main/java/cn/palmte/work/controller/backend/ProjectController.java b/src/main/java/cn/palmte/work/controller/backend/ProjectController.java
index 3c462c6..fa31de1 100644
--- a/src/main/java/cn/palmte/work/controller/backend/ProjectController.java
+++ b/src/main/java/cn/palmte/work/controller/backend/ProjectController.java
@@ -113,7 +113,7 @@ public class ProjectController extends BaseController {
     public String add(Map<String, Object> model) {
         Dept one = deptService.findUserDept(InterfaceUtil.getAdmin());
         model.put("dept", one);
-
+        model.put("projectId",-1);
         return "admin/project_estimate_add";
     }
 
diff --git a/src/main/resources/templates/admin/project_estimate_add.ftl b/src/main/resources/templates/admin/project_estimate_add.ftl
index ca0b4de..d34b3f3 100644
--- a/src/main/resources/templates/admin/project_estimate_add.ftl
+++ b/src/main/resources/templates/admin/project_estimate_add.ftl
@@ -18,7 +18,7 @@
                     <div class="am-tab-panel am-fade am-in am-active" id="tab1">
                     <#--<input name="permissionID" id="permissionID" type="hidden" value="${permissionID!}" />-->
                         <!--验证表单元素（validate) begin-->
-
+                        <input name="id" id="id" type="hidden" value="${projectId}" />
                         <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-6 am-u-md-6">
@@ -461,7 +461,7 @@
             $("#saveApprove").attr('disabled',true);
             checkIfFillIn();
             if (check == 1) {
-                $("#saveDraft").attr('disabled', false);
+                $("#saveApprove").attr('disabled', false);
                 return;
             }
             setTimeout(function () {

From 5d411a62a570294644bedcadd1286ed8735c4b64 Mon Sep 17 00:00:00 2001
From: hanbo <2608504783@qq.com>
Date: Mon, 18 Apr 2022 16:17:03 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E6=98=93=E7=94=A8=E6=80=A7=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/resources/templates/admin/project_estimate_add.ftl | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/main/resources/templates/admin/project_estimate_add.ftl b/src/main/resources/templates/admin/project_estimate_add.ftl
index d34b3f3..37fb5fd 100644
--- a/src/main/resources/templates/admin/project_estimate_add.ftl
+++ b/src/main/resources/templates/admin/project_estimate_add.ftl
@@ -444,6 +444,7 @@
     $(function () {
         calIncomeAndCost();
         $("#saveDraft").click(function () {
+            check = 0;
             $("#saveDraft").attr('disabled',true);
             checkIfFillIn();
             if (check == 1) {
@@ -458,6 +459,7 @@
 
         });
         $("#saveApprove").click(function () {
+            check = 0;
             $("#saveApprove").attr('disabled',true);
             checkIfFillIn();
             if (check == 1) {