From 7488e711a4ef988a2be849b3fdb499df7f2ed872 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=98wangjiuyun?= <‘1595161655@qq.com>
Date: Thu, 7 Nov 2024 10:50:19 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A2=84=E7=AE=97=E5=BF=85=E5=A1=AB=20?=
 =?UTF-8?q?=E8=B5=84=E9=87=91=E8=AE=A1=E5=88=92=E8=A1=A8=E8=BE=93=E5=85=A5?=
 =?UTF-8?q?=E6=A1=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../static/assets/js/project_budget.js        | 37 +++++++++++++++++++
 .../static/assets/js/project_budget_plan.js   |  4 +-
 .../templates/admin/project_budget_edit.ftl   | 10 ++---
 .../templates/admin/project_estimate_add.ftl  |  2 +-
 4 files changed, 45 insertions(+), 8 deletions(-)

diff --git a/src/main/resources/static/assets/js/project_budget.js b/src/main/resources/static/assets/js/project_budget.js
index 3bef2b3..f59af9c 100644
--- a/src/main/resources/static/assets/js/project_budget.js
+++ b/src/main/resources/static/assets/js/project_budget.js
@@ -394,6 +394,16 @@ function checkIfFillIn() {
     var valueRisk = $("#valueRiskBudget").val();
     var principal = $("#principalBudget").val();
 
+
+    var contractTimeBudget = $("#contractTimeBudget").val();
+    var bidsTimeBudget = $("#bidsTimeBudget").val();
+    var isSecondBudget = $("#isSecondBudget").val();
+    var signTypeBudget = $("#signTypeBudget").val();
+    var calculationCollectionBudget = $("#calculationCollectionBudget").val();
+
+
+
+
     if (name.length <= 0) {
         window.confirm('项目名称不能为空');
         check = 1;
@@ -511,6 +521,33 @@ function checkIfFillIn() {
         check = 1;
         return;
     }
+
+    if (contractTimeBudget.length <= 0) {
+        window.confirm('预计合同签订时间不能为空');
+        check = 1;
+        return;
+    }
+    //
+    if (bidsTimeBudget.length <= 0) {
+        window.confirm('项目计划招标时间不能为空');
+        check = 1;
+        return;
+    }
+    if(!isSecondBudget){
+        window.confirm('是否二次合作不能为空');
+        check = 1;
+        return;
+    }
+    if(!signTypeBudget){
+        window.confirm('是否汇智中标不能为空');
+        check = 1;
+        return;
+    }
+    if(!calculationCollectionBudget){
+        window.confirm('计收计划不能为空');
+        check = 1;
+        return;
+    }
 }
 
 /**
diff --git a/src/main/resources/static/assets/js/project_budget_plan.js b/src/main/resources/static/assets/js/project_budget_plan.js
index a43a403..3ec5584 100644
--- a/src/main/resources/static/assets/js/project_budget_plan.js
+++ b/src/main/resources/static/assets/js/project_budget_plan.js
@@ -392,8 +392,8 @@ function appendTrBudgetPlan() {
         '        <td style="display: block;"><input type="text" maxlength="16" value="0.00" class="number am-modal-prompt-input am-modal-prompt-input-budget-plan-detail input-changeable-service-cost-budget-plan" readonly></td>\n' +
         '        <td style="display: block;"><input type="text" maxlength="16" value="0.00" class="number am-modal-prompt-input am-modal-prompt-input-budget-plan-detail input-changeable-other-cost-budget-plan" readonly></td>\n' +
 
-        '        <td style="display: block;"><input type="text" maxlength="16" value="0.00" class="number am-modal-prompt-input am-modal-prompt-input-budget-plan-detail input-changeable-project-manage-cost-budget-plan" readonly></td>\n' +
-        '        <td style="display: block;"><input type="text" maxlength="16" value="0.00" class="number am-modal-prompt-input am-modal-prompt-input-budget-plan-detail input-changeable-earnest-money-cost-budget-plan" readonly></td>\n' +
+        '        <td style="display: block;"><input type="text" maxlength="16" value="0.00" class="number am-modal-prompt-input am-modal-prompt-input-budget-plan-detail input-changeable-project-manage-cost-budget-plan" ></td>\n' +
+        '        <td style="display: block;"><input type="text" maxlength="16" value="0.00" class="number am-modal-prompt-input am-modal-prompt-input-budget-plan-detail input-changeable-earnest-money-cost-budget-plan" ></td>\n' +
         '        <td style="display: block;"><input type="text" value="0.00" class="number am-modal-prompt-input am-modal-prompt-input-budget-plan-detail input-changeable-total-cost-budget-plan" readonly></td>\n' +
         '        <td style="display: block;"><input type="text" maxlength="16" value="0.00" class="number am-modal-prompt-input am-modal-prompt-input-budget-plan-detail input-changeable-sale-income-budget-plan"></td>\n' +
         '        <td style="display: block;"><input type="text" maxlength="16" value="0.00" class="number am-modal-prompt-input am-modal-prompt-input-budget-plan-detail input-changeable-earnest-money-income-budget-plan"></td>\n' +
diff --git a/src/main/resources/templates/admin/project_budget_edit.ftl b/src/main/resources/templates/admin/project_budget_edit.ftl
index 50fd142..575d291 100644
--- a/src/main/resources/templates/admin/project_budget_edit.ftl
+++ b/src/main/resources/templates/admin/project_budget_edit.ftl
@@ -787,7 +787,7 @@
                                            name="principalBudget" placeholder="请输入项目负责人" maxlength="20"
                                            value="${projectBudget.principalBudget!}"/>
                                 </td>
-                                <th class="table-title" colspan="1"><span
+                                <th class="table-title" colspan="1"><span style="color: red;">*</span><span
                                             style="font-size: 15px">预计合同签订时间:</span></th>
                                 <td class="table-title" colspan="1">
                                     <input type="text" class="am-form-field am-input-sm" style="border-style:none;"
@@ -797,7 +797,7 @@
                                            placeholder="预计合同签订时间"
                                            data-am-datepicker>
                                 </td>
-                                <th class="table-title" colspan="1"><span
+                                <th class="table-title" colspan="1"><span style="color: red;">*</span><span
                                             style="font-size: 15px">项目计划招标时间:</span></th>
                                 <td class="table-title" colspan="1">
                                     <input type="text" class="am-form-field am-input-sm" style="border-style:none;"
@@ -809,7 +809,7 @@
                                 </td>
                             </tr>
                             <tr class="am-text-nowrap">
-                                <th class="table-title" colspan="1"><span style="font-size: 15px">是否二次合作:</span>
+                                <th class="table-title" colspan="1"><span style="color: red;">*</span><span style="font-size: 15px">是否二次合作:</span>
                                 </th>
                                 <td class="table-title" colspan="1">
                                     <select data-am-selected="{btnSize: 'sm',btnWidth: '80%',searchBox: 1}"
@@ -827,7 +827,7 @@
                                         </#if>
                                     </select>
                                 </td>
-                                <th class="table-title" colspan="1"><span style="font-size: 15px">是否汇智中标:</span>
+                                <th class="table-title" colspan="1"><span style="color: red;">*</span><span style="font-size: 15px">是否汇智中标:</span>
                                 </th>
                                 <td class="table-title" colspan="3">
                                     <select data-am-selected="{btnSize: 'sm',btnWidth: '80%',searchBox: 1}"
@@ -869,7 +869,7 @@
                             <#--                            </td>-->
                             <#--                        </tr>-->
                             <tr class="am-text-nowrap">
-                                <th class="table-title" colspan="1"><span style="font-size: 15px">计收计划:</span></th>
+                                <th class="table-title" colspan="1"><span style="color: red;">*</span><span style="font-size: 15px">计收计划:</span></th>
                                 <td class="table-title" colspan="5">
                                     <textarea rows="3" cols="20" id="calculationCollectionBudget"
                                               name="calculationCollectionBudget" maxlength="1000"
diff --git a/src/main/resources/templates/admin/project_estimate_add.ftl b/src/main/resources/templates/admin/project_estimate_add.ftl
index 3f126f2..1dcfbaf 100644
--- a/src/main/resources/templates/admin/project_estimate_add.ftl
+++ b/src/main/resources/templates/admin/project_estimate_add.ftl
@@ -879,7 +879,7 @@
         //     return;
         // }
         //
-        if (calculationCollection == undefined || calculationCollection.length <= 0) {
+        if (!calculationCollection) {
             window.confirm('计收计划不能为空');
             check = 1;
             return;