From 24e1d142cabcc67501dff1a43ad3715d32c961ef Mon Sep 17 00:00:00 2001
From: OathK1per <zhangypg@gmail.com>
Date: Fri, 26 Aug 2022 15:58:38 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../static/assets/js/project_budget_cost.js   | 14 +++----
 .../js/project_budget_cost_project_manage.js  |  4 +-
 .../assets/js/project_budget_income_plan.js   |  6 +--
 .../templates/admin/project_approve.ftl       | 32 +++++++-------
 .../templates/admin/project_budget_edit.ftl   | 42 +++++++++----------
 5 files changed, 49 insertions(+), 49 deletions(-)

diff --git a/src/main/resources/static/assets/js/project_budget_cost.js b/src/main/resources/static/assets/js/project_budget_cost.js
index 65e8c76..cf2efb9 100644
--- a/src/main/resources/static/assets/js/project_budget_cost.js
+++ b/src/main/resources/static/assets/js/project_budget_cost.js
@@ -14,13 +14,13 @@ COST_DETAIL={
     "totalTaxInclude":[true,"含税总金额","number"],
     "totalTaxExclude":[true,"不含税金额","number"],
     "totalTax":[true,"税金","number"],
-    "contractParty":[true,"签约方","string"],
-    "isUnderwritten":[true,"是否垫资","string"],
-    "underwrittenAmount":[true,"预估垫资金额","number"],
-    "payTime":[true,"支出时间","string"],
-    "payAmount":[true,"支出金额","number"],
-    "payWay":[true,"付款方式","string"],
-    "remark":[true,"备注","string"]
+    "contractParty":[false,"签约方","string"],
+    "isUnderwritten":[false,"是否垫资","string"],
+    "underwrittenAmount":[false,"预估垫资金额","number"],
+    "payTime":[false,"支出时间","string"],
+    "payAmount":[false,"支出金额","number"],
+    "payWay":[false,"付款方式","string"],
+    "remark":[false,"备注","string"]
 };
 /*
 [
diff --git a/src/main/resources/static/assets/js/project_budget_cost_project_manage.js b/src/main/resources/static/assets/js/project_budget_cost_project_manage.js
index 1b66ed2..6932cf8 100644
--- a/src/main/resources/static/assets/js/project_budget_cost_project_manage.js
+++ b/src/main/resources/static/assets/js/project_budget_cost_project_manage.js
@@ -12,8 +12,8 @@ COST_PROJECT_MANAGE_DETAIL={
     "amount":[true,"数量","string"],
     "price":[true,"单价","price"],
     "total":[true,"总金额","number"],
-    "payTime":[true,"支出时间","string"],
-    "payAmount":[true,"支出金额","number"],
+    "payTime":[false,"支出时间","string"],
+    "payAmount":[false,"支出金额","number"],
     "predictMethod":[false,"预估计算方法","string"],
     "predictWhy":[false,"预估依据","string"],
     "remark":[false,"备注","string"],
diff --git a/src/main/resources/static/assets/js/project_budget_income_plan.js b/src/main/resources/static/assets/js/project_budget_income_plan.js
index 0c1f334..d22eb67 100644
--- a/src/main/resources/static/assets/js/project_budget_income_plan.js
+++ b/src/main/resources/static/assets/js/project_budget_income_plan.js
@@ -4,9 +4,9 @@
 //INCOME_DETAIL_ARR=["type","name","unit","amount","price","taxRate","totalTaxInclude","totalTaxExclude"];
 INCOME_PLAN_DETAIL={
     "num":[false,"序号","string"],
-    "receivePoint":[true,"收款节点","string"],
-    "receiveTime":[true,"收款时间","string"],
-    "receiveAmount":[true,"收款金额","number"]
+    "receivePoint":[false,"收款节点","string"],
+    "receiveTime":[false,"收款时间","string"],
+    "receiveAmount":[false,"收款金额","number"]
 };
 
 $(function () {
diff --git a/src/main/resources/templates/admin/project_approve.ftl b/src/main/resources/templates/admin/project_approve.ftl
index d403254..036a100 100644
--- a/src/main/resources/templates/admin/project_approve.ftl
+++ b/src/main/resources/templates/admin/project_approve.ftl
@@ -770,9 +770,9 @@
                                             <#list incomePlanDetails as incomePlanDetail>
                                                 <tr>
                                                     <td>${(incomePlanDetail_index+1)!}</td>
-                                                    <td><input type="text" class="am-modal-prompt-input am-modal-prompt-input-income-plan" value="${incomePlanDetail.receivePoint!}"></td>
-                                                    <td><input type="text" class="am-modal-prompt-input am-modal-prompt-input-income-plan incomePlanTime" value="${(incomePlanDetail.receiveTime?string("yyyy-MM-dd"))!}" autocomplete="off" data-am-datepicker></td>
-                                                    <td><input type="text" class="number am-modal-prompt-input am-modal-prompt-input-income-plan input-changeable-receive input-changeable-receive-income-plan" value="${Utils.format(incomePlanDetail.receiveAmount,'0')}"></td>
+                                                    <td><input type="text" class="am-modal-prompt-input am-modal-prompt-input-income-plan" value="${incomePlanDetail.receivePoint!}" readonly></td>
+                                                    <td><input type="text" class="am-modal-prompt-input am-modal-prompt-input-income-plan incomePlanTime" value="${(incomePlanDetail.receiveTime?string("yyyy-MM-dd"))!}" autocomplete="off" readonly></td>
+                                                    <td><input type="text" class="number am-modal-prompt-input am-modal-prompt-input-income-plan input-changeable-receive input-changeable-receive-income-plan" value="${Utils.format(incomePlanDetail.receiveAmount,'0')}" readonly></td>
                                                 </tr>
                                             </#list>
                                         </#if>
@@ -844,7 +844,7 @@
                                                             <#if costDetail.category == procurementType.id>${procurementType.name}</#if>
                                                         </#list>
                                                     </td>
-                                                    <td width="220px"><input type="text" readonly
+                                                    <td width="120px"><input type="text" readonly
                                                                class="am-modal-prompt-input am-modal-prompt-input-cost"
                                                                value="${costDetail.name!}"></td>
                                                     <td width="80px"><input type="text" readonly
@@ -853,28 +853,28 @@
                                                     <td width="80px"><input type="text" readonly
                                                                class="am-modal-prompt-input am-modal-prompt-input-cost input-changeable-amount"
                                                                value="${costDetail.amount!0}"></td>
-                                                    <td width="200px"><input type="text" readonly
+                                                    <td width="100px"><input type="text" readonly
                                                                class="am-modal-prompt-input am-modal-prompt-input-cost input-changeable-price"
                                                                value="${Utils.format2(costDetail.price,'0.00')}"></td>
                                                     <td width="100px"><input type="text" min="0.00" max="99.99" step="0.01" readonly
                                                                class="am-modal-prompt-input am-modal-prompt-input-cost input-changeable-tax-rate"
                                                                value="${Utils.format(costDetail.taxRate,'0.00')}"></td>
-                                                    <td width="200px"><input type="text"
+                                                    <td width="100px"><input type="text"
                                                                class="am-modal-prompt-input am-modal-prompt-input-cost input-changeable-total-tax-include"
                                                                value="${Utils.format(costDetail.totalTaxInclude,'0.00')}"
                                                                readonly>
                                                     </td>
-                                                    <td width="200px"><input type="text"
+                                                    <td width="100px"><input type="text"
                                                                class="am-modal-prompt-input am-modal-prompt-input-cost input-changeable-total-tax-exclude"
                                                                value="${Utils.format(costDetail.totalTaxExclude,'0.00')}"
                                                                readonly>
                                                     </td>
-                                                    <td width="200px"><input type="text"
+                                                    <td width="100px"><input type="text"
                                                                              class="am-modal-prompt-input am-modal-prompt-input-cost input-changeable-total-tax"
                                                                              value="${Utils.format(costDetail.totalTax,'0.00')}"
                                                                              readonly>
                                                     </td>
-                                                    <td><input type="text" class="am-modal-prompt-input am-modal-prompt-input-cost" value="${costDetail.contractParty!}"></td>
+                                                    <td width="100px"><input type="text" class="am-modal-prompt-input am-modal-prompt-input-cost" value="${costDetail.contractParty!}" readonly></td>
                                                     <td width="60px">
                                                         <#--<select style="width: auto" readonly
                                                                 class="am-modal-prompt-input am-modal-prompt-input-cost am-modal-prompt-input-cost-type">
@@ -895,11 +895,11 @@
                                                             否
                                                         </#if>
                                                     </td>
-                                                    <td><input type="text" class="am-modal-prompt-input am-modal-prompt-input-cost input-changeable-total-underwritten-amount-cost" value="${Utils.format(costDetail.underwrittenAmount,'0')}"></td>
-                                                    <td><input style="width: 150px;float: left;" type="text" class="am-modal-prompt-input am-modal-prompt-input-cost" value="${(costDetail.payTime?string("yyyy-MM-dd"))!}" data-am-datepicker></td>
-                                                    <td><input type="text" class="am-modal-prompt-input am-modal-prompt-input-cost input-changeable-total-pay-amount-cost" value="${Utils.format(costDetail.payAmount,'0')}"></td>
-                                                    <td><input type="text" class="am-modal-prompt-input am-modal-prompt-input-cost" value="${costDetail.payWay!}"></td>
-                                                    <td><input type="text" class="am-modal-prompt-input am-modal-prompt-input-cost" value="${costDetail.remark!}"></td>
+                                                    <td width="100px"><input type="text" class="am-modal-prompt-input am-modal-prompt-input-cost input-changeable-total-underwritten-amount-cost" value="${Utils.format(costDetail.underwrittenAmount,'0')}" readonly></td>
+                                                    <td width="130px"><input type="text" class="am-modal-prompt-input am-modal-prompt-input-cost" value="${(costDetail.payTime?string("yyyy-MM-dd"))!}" readonly></td>
+                                                    <td width="100px"><input type="text" class="am-modal-prompt-input am-modal-prompt-input-cost input-changeable-total-pay-amount-cost" value="${Utils.format(costDetail.payAmount,'0')}" readonly></td>
+                                                    <td width="100px"><input type="text" class="am-modal-prompt-input am-modal-prompt-input-cost" value="${costDetail.payWay!}" readonly></td>
+                                                    <td width="100px"><input type="text" class="am-modal-prompt-input am-modal-prompt-input-cost" value="${costDetail.remark!}" readonly></td>
                                                     <#--<td>
                                                          <button type="button"
                                                                  class="am-btn am-btn-warning am-btn-xs am-round am-modal-line-delete">
@@ -1001,8 +1001,8 @@
                                                                class="am-modal-prompt-input am-modal-prompt-input-cost-project-manage input-changeable-total-project-manage"
                                                                value="${Utils.format(costProjectManageDetail.total,'0.00')}"
                                                                readonly></td>
-                                                    <td width="120px"><input type="text" class="am-modal-prompt-input am-modal-prompt-input-cost-project-manage" value="${(costProjectManageDetail.payTime?string("yyyy-MM-dd"))!}" data-am-datepicker></td>
-                                                    <td width="120px"><input type="text" class="am-modal-prompt-input am-modal-prompt-input-cost-project-manage input-changeable-pay-amount-project-manage" value="${Utils.format(costProjectManageDetail.payAmount,'0.00')}"></td>
+                                                    <td width="120px"><input type="text" class="am-modal-prompt-input am-modal-prompt-input-cost-project-manage" value="${(costProjectManageDetail.payTime?string("yyyy-MM-dd"))!}"  readonly></td>
+                                                    <td width="120px"><input type="text" class="am-modal-prompt-input am-modal-prompt-input-cost-project-manage input-changeable-pay-amount-project-manage" value="${Utils.format(costProjectManageDetail.payAmount,'0.00')}" readonly></td>
                                                     <td width="120px"><input type="text" readonly
                                                                class="am-modal-prompt-input am-modal-prompt-input-cost-project-manage"
                                                                value="${costProjectManageDetail.predictMethod!}"></td>
diff --git a/src/main/resources/templates/admin/project_budget_edit.ftl b/src/main/resources/templates/admin/project_budget_edit.ftl
index b219642..6c6a454 100644
--- a/src/main/resources/templates/admin/project_budget_edit.ftl
+++ b/src/main/resources/templates/admin/project_budget_edit.ftl
@@ -731,16 +731,16 @@
                             <#list costDetails as costDetail>
                                 <tr>
                                     <td><input type="text" class="am-modal-prompt-input am-modal-prompt-input-cost input-budget-num" value="${(costDetail_index+1)!}" readonly></td>
-                                    <td>
-                                        <select style="width: 100px;float: left;" class="am-modal-prompt-input am-modal-prompt-input-cost am-modal-prompt-input-cost-type">
+                                    <td width="70px">
+                                        <select style="float: left;" class="am-modal-prompt-input am-modal-prompt-input-cost am-modal-prompt-input-cost-type">
                                             <option value="1" <#if costDetail.type == 1>selected</#if>>设备</option>
                                             <option value="2" <#if costDetail.type == 2>selected</#if>>施工</option>
                                             <option value="3" <#if costDetail.type == 3>selected</#if>>服务</option>
                                             <option value="4" <#if costDetail.type == 4>selected</#if>>其他</option>
                                         </select>
                                     </td>
-                                    <td>
-                                        <select style="width: 180px;float: left;" class="am-modal-prompt-input am-modal-prompt-input-cost am-modal-prompt-input-cost-category">
+                                    <td width="150px">
+                                        <select style="float: left;" class="am-modal-prompt-input am-modal-prompt-input-cost am-modal-prompt-input-cost-category">
                                             <#--<option value="1" <#if costDetail.category == 1>selected</#if>>华智产品</option>
                                             <option value="2" <#if costDetail.category == 2>selected</#if>>紫光其他产品</option>
                                             <option value="3" <#if costDetail.category == 3>selected</#if>>外购产品</option>
@@ -754,27 +754,27 @@
                                             </#list>
                                         </select>
                                     </td>
-                                    <td><input type="text" class="am-modal-prompt-input am-modal-prompt-input-cost" value="${costDetail.name!}"></td>
-                                    <td><input type="text" class="am-modal-prompt-input am-modal-prompt-input-cost" value="${costDetail.unit!}"></td>
-                                    <td><input type="number" min="0" max="99999999" step="1" maxlength="8" class="am-modal-prompt-input am-modal-prompt-input-cost input-changeable-amount input-changeable-amount-cost" value="${costDetail.amount!0}" oninput="if(value.length>8)value=value.slice(0,8)" <#--onkeyup="integerNumber(this)"-->></td>
-                                    <td><input type="text" maxlength="19" class="price am-modal-prompt-input am-modal-prompt-input-cost input-changeable-price input-changeable-price-cost" value="${Utils.format2(costDetail.price,'0')}" oninput="if(value.length>19)value=value.slice(0,19)"></td>
-                                    <td><input type="text" maxlength="5" class="number am-modal-prompt-input am-modal-prompt-input-cost input-changeable-tax-rate input-changeable-tax-rate-cost" value="${Utils.format(costDetail.taxRate,'0')}" oninput="if(value.length>5)value=value.slice(0,5)"></td>
-                                    <td><input type="text" class="am-modal-prompt-input am-modal-prompt-input-cost input-changeable-total-tax-include input-changeable-total-tax-include-cost" value="${Utils.format(costDetail.totalTaxInclude,'0')}" readonly></td>
-                                    <td><input type="text" class="am-modal-prompt-input am-modal-prompt-input-cost input-changeable-total-tax-exclude input-changeable-total-tax-exclude-cost" value="${Utils.format(costDetail.totalTaxExclude,'0')}" readonly></td>
-                                    <td><input type="text" class="am-modal-prompt-input am-modal-prompt-input-cost input-changeable-total-tax input-changeable-total-tax-cost" value="${Utils.format(costDetail.totalTax,'0')}" readonly></td>
-                                    <td><input type="text" class="am-modal-prompt-input am-modal-prompt-input-cost" value="${costDetail.contractParty!}"></td>
-                                    <td>
-                                        <select style="width: 100px;float: left;" class="am-modal-prompt-input am-modal-prompt-input-cost am-modal-prompt-input-cost-underwritten">
+                                    <td width="100px"><input type="text" class="am-modal-prompt-input am-modal-prompt-input-cost" value="${costDetail.name!}"></td>
+                                    <td width="80px"><input type="text" class="am-modal-prompt-input am-modal-prompt-input-cost" value="${costDetail.unit!}"></td>
+                                    <td width="100px"><input type="number" min="0" max="99999999" step="1" maxlength="8" class="am-modal-prompt-input am-modal-prompt-input-cost input-changeable-amount input-changeable-amount-cost" value="${costDetail.amount!0}" oninput="if(value.length>8)value=value.slice(0,8)" <#--onkeyup="integerNumber(this)"-->></td>
+                                    <td width="100px"><input type="text" maxlength="19" class="price am-modal-prompt-input am-modal-prompt-input-cost input-changeable-price input-changeable-price-cost" value="${Utils.format2(costDetail.price,'0')}" oninput="if(value.length>19)value=value.slice(0,19)"></td>
+                                    <td width="100px"><input type="text" maxlength="5" class="number am-modal-prompt-input am-modal-prompt-input-cost input-changeable-tax-rate input-changeable-tax-rate-cost" value="${Utils.format(costDetail.taxRate,'0')}" oninput="if(value.length>5)value=value.slice(0,5)"></td>
+                                    <td width="100px"><input type="text" class="am-modal-prompt-input am-modal-prompt-input-cost input-changeable-total-tax-include input-changeable-total-tax-include-cost" value="${Utils.format(costDetail.totalTaxInclude,'0')}" readonly></td>
+                                    <td width="100px"><input type="text" class="am-modal-prompt-input am-modal-prompt-input-cost input-changeable-total-tax-exclude input-changeable-total-tax-exclude-cost" value="${Utils.format(costDetail.totalTaxExclude,'0')}" readonly></td>
+                                    <td width="100px"><input type="text" class="am-modal-prompt-input am-modal-prompt-input-cost input-changeable-total-tax input-changeable-total-tax-cost" value="${Utils.format(costDetail.totalTax,'0')}" readonly></td>
+                                    <td width="100px"><input type="text" class="am-modal-prompt-input am-modal-prompt-input-cost" value="${costDetail.contractParty!}"></td>
+                                    <td width="60px">
+                                        <select style="float: left;" class="am-modal-prompt-input am-modal-prompt-input-cost am-modal-prompt-input-cost-underwritten">
                                             <option value="0" <#if costDetail.isUnderwritten == 0>selected</#if>></option>
                                             <option value="1" <#if costDetail.isUnderwritten == 1>selected</#if>>是</option>
                                             <option value="2" <#if costDetail.isUnderwritten == 2>selected</#if>>否</option>
                                         </select>
                                     </td>
-                                    <td><input type="text" class="am-modal-prompt-input am-modal-prompt-input-cost input-changeable-total-underwritten-amount-cost" value="${Utils.format(costDetail.underwrittenAmount,'0')}"></td>
-                                    <td><input style="width: 150px;float: left;" type="text" class="am-modal-prompt-input am-modal-prompt-input-cost" value="${(costDetail.payTime?string("yyyy-MM-dd"))!}" data-am-datepicker></td>
-                                    <td><input type="text" class="am-modal-prompt-input am-modal-prompt-input-cost input-changeable-total-pay-amount-cost" value="${Utils.format(costDetail.payAmount,'0')}"></td>
-                                    <td><input type="text" class="am-modal-prompt-input am-modal-prompt-input-cost" value="${costDetail.payWay!}"></td>
-                                    <td><input type="text" class="am-modal-prompt-input am-modal-prompt-input-cost" value="${costDetail.remark!}"></td>
+                                    <td width="100px"><input type="text" class="am-modal-prompt-input am-modal-prompt-input-cost input-changeable-total-underwritten-amount-cost" value="${Utils.format(costDetail.underwrittenAmount,'0')}"></td>
+                                    <td width="130px"><input style="float: left;" type="text" class="am-modal-prompt-input am-modal-prompt-input-cost" value="${(costDetail.payTime?string("yyyy-MM-dd"))!}" data-am-datepicker></td>
+                                    <td width="100px"><input type="text" class="am-modal-prompt-input am-modal-prompt-input-cost input-changeable-total-pay-amount-cost" value="${Utils.format(costDetail.payAmount,'0')}"></td>
+                                    <td width="100px"><input type="text" class="am-modal-prompt-input am-modal-prompt-input-cost" value="${costDetail.payWay!}"></td>
+                                    <td width="100px"><input type="text" class="am-modal-prompt-input am-modal-prompt-input-cost" value="${costDetail.remark!}"></td>
                                     <td><button type="button" style="margin-top: 10px" class="am-btn am-btn-danger am-btn-xs am-round am-modal-line-delete"><span class="am-icon-minus"></span></button></td>
                                 </tr>
                             </#list>
@@ -838,7 +838,7 @@
                                 <tr>
                                     <td><input type="text" class="am-modal-prompt-input am-modal-prompt-input-cost-project-manage input-budget-num" value="${(costProjectManageDetail_index+1)!}" readonly></td>
                                     <td>
-                                        <select style="width: 180px;float: left;" class="am-modal-prompt-input am-modal-prompt-input-cost-project-manage am-modal-prompt-input-cost-project-manage-type">
+                                        <select style="width: 120px;float: left;" class="am-modal-prompt-input am-modal-prompt-input-cost-project-manage am-modal-prompt-input-cost-project-manage-type">
                                             <option value="1" <#if costProjectManageDetail.type == 1>selected</#if>>人工成本</option>
                                             <option value="2" <#if costProjectManageDetail.type == 2>selected</#if>>业务费用</option>
                                             <option value="3" <#if costProjectManageDetail.type == 3>selected</#if>>其他费用</option>