From 541e491f447cda9ab5148e8d2d9f80e0bea426ca Mon Sep 17 00:00:00 2001
From: hanbo <2608504783@qq.com>
Date: Tue, 17 May 2022 14:52:09 +0800
Subject: [PATCH] =?UTF-8?q?=E6=98=93=E7=94=A8=E6=80=A7=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../templates/admin/project_approve.ftl       | 44 +++++++++----------
 1 file changed, 22 insertions(+), 22 deletions(-)

diff --git a/src/main/resources/templates/admin/project_approve.ftl b/src/main/resources/templates/admin/project_approve.ftl
index 3b5ce3c..8a182f5 100644
--- a/src/main/resources/templates/admin/project_approve.ftl
+++ b/src/main/resources/templates/admin/project_approve.ftl
@@ -137,7 +137,7 @@
                             <!--验证表单元素（validate) begin-->
 
                             <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><input readonly style="text-align: right;width: 69px; margin-bottom: 8px;" value="部门名称"></div>
+                                <div class="am-u-sm-4 am-u-md-2 am-text-right"><span style="color: red">*</span><input readonly style="text-align: right;width: 69px; margin-bottom: 13px;" value="部门名称"></div>
                                 <div class="am-u-sm-6 am-u-md-6">
                                     <input readonly value="${project.deptName}"></input>
                                 </div>
@@ -160,7 +160,7 @@
                             </div>
 
                             <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><input readonly style="text-align: right;width: 69px" value="项目名称"></div>
+                                <div class="am-u-sm-4 am-u-md-2 am-text-right"><span style="color: red;">*</span><input readonly style="text-align: right;width: 69px;margin-bottom: 6px;" value="项目名称"></div>
                                 <div class="am-u-sm-6 am-u-md-6">
                                     <#--<textarea style="overflow:auto; background-attachment: fixed;
                                     background-repeat: no-repeat; border-style: solid;border-color: #FFFFFF">${project.name}</textarea>-->
@@ -170,7 +170,7 @@
                             </div>
 
                             <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><input readonly style="text-align: right;width: 69px ;margin-bottom: 6px;" value="项目类型"></div>
+                                <div class="am-u-sm-4 am-u-md-2 am-text-right"><span style="color: red;">*</span><input readonly style="text-align: right;width: 69px ;margin-bottom: 12px;" value="项目类型"></div>
                                 <div class="am-u-sm-6 am-u-md-6">
                         <span>
                         <#if (project.type) =1>
@@ -185,7 +185,7 @@
                                 <div class="am-u-sm-2 am-u-md-4 input-msg"></div>
                             </div>
                             <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><input readonly style="text-align: right;width: 69px ;margin-bottom: 6px;" value="垫资模式"></div>
+                                <div class="am-u-sm-4 am-u-md-2 am-text-right"><span style="color: red;">*</span><input readonly style="text-align: right;width: 69px ;margin-bottom: 12px;" value="垫资模式"></div>
                                 <div class="am-u-sm-6 am-u-md-6">
                         <span>
                         <#if (project.underwrittenMode) =1>
@@ -203,7 +203,7 @@
                             </div>
 
                             <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><input readonly style="text-align: right;width: 69px ;" value="客户名称"></div>
+                                <div class="am-u-sm-4 am-u-md-2 am-text-right"><span style="color: red;">*</span><input readonly style="text-align: right;width: 69px ;margin-bottom: 6px;" value="客户名称"></div>
                                 <div class="am-u-sm-6 am-u-md-6">
                                    <#-- <textarea style="overflow:auto; background-attachment: fixed;
                                     background-repeat: no-repeat; border-style: solid;border-color: #FFFFFF">${project.customer}</textarea>-->
@@ -213,7 +213,7 @@
                             </div>
 
                             <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><input readonly style="text-align: right;width: 100px ;" value="终端客户名称"></div>
+                                <div class="am-u-sm-4 am-u-md-2 am-text-right"><span style="color: red;">*</span><input readonly style="text-align: right;width: 100px ;margin-bottom: 6px;" value="终端客户名称"></div>
                                 <div class="am-u-sm-6 am-u-md-6">
                                     <#--<textarea style="overflow:auto; background-attachment: fixed;
                                     background-repeat: no-repeat; border-style: solid;border-color: #FFFFFF">${project.terminalCustomer}</textarea>-->
@@ -236,14 +236,14 @@
                             <#--                                <div class="am-u-sm-2 am-u-md-4 input-msg"></div>-->
                             <#--                            </div>-->
                             <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><input readonly style="text-align: right;width: 69px;margin-bottom: 6px;" value="合同金额"></div>
+                                <div class="am-u-sm-4 am-u-md-2 am-text-right"><span style="color: red;">*</span><input readonly style="text-align: right;width: 69px;margin-bottom: 12px;" value="合同金额"></div>
                                 <div class="am-u-sm-6 am-u-md-6">
                                     <input readonly value="${Utils.format(project.contractAmount)}元"></input>
                                 </div>
                                 <div class="am-u-sm-2 am-u-md-4 input-msg"></div>
                             </div>
                             <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><input readonly style="text-align: right;width: 100px;margin-bottom: 6px;" value="行业场景应用"></div>
+                                <div class="am-u-sm-4 am-u-md-2 am-text-right"><span style="color: red;">*</span><input readonly style="text-align: right;width: 100px;margin-bottom: 12px;" value="行业场景应用"></div>
                                 <div class="am-u-sm-6 am-u-md-6">
                                     <input readonly value="${project.industryScenario}"></input>
                                 </div>
@@ -264,7 +264,7 @@
                                 <div class="am-u-sm-2 am-u-md-4 input-msg"></div>
                             </div>
                             <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><input readonly style="text-align: right;width: 116px;margin-top: 0px;" value="主合同收款条款"></div>
+                                <div class="am-u-sm-4 am-u-md-2 am-text-right"><span style="color: red;">*</span><input readonly style="text-align: right;width: 116px;margin-top: -6px;" value="主合同收款条款"></div>
                                 <div class="am-u-sm-6 am-u-md-6">
                                     <textarea style="overflow:auto; background-attachment: fixed;
                                     background-repeat: no-repeat; border-style: solid;border-color: #FFFFFF">${project.mainContractCollectionTerms!}</textarea>
@@ -272,7 +272,7 @@
                                 <div class="am-u-sm-2 am-u-md-4 input-msg"></div>
                             </div>
                             <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><input readonly style="text-align: right;width: 90px;margin-top: 0px;" value="价值及风险"></div>
+                                <div class="am-u-sm-4 am-u-md-2 am-text-right"><span style="color: red;">*</span><input readonly style="text-align: right;width: 90px;margin-top: -6px;" value="价值及风险"></div>
                                 <div class="am-u-sm-6 am-u-md-6">
                                     <textarea style="overflow:auto; background-attachment: fixed;
                                     background-repeat: no-repeat; border-style: solid;border-color: #FFFFFF">${project.valueRisk!}</textarea>
@@ -495,26 +495,26 @@
                                                             服务类
                                                         </#if>
                                                     </td>
-                                                    <td><input type="text" readonly
+                                                    <td width="220px"><input type="text" readonly
                                                                class="am-modal-prompt-input am-modal-prompt-input-income"
                                                                value="${incomeDetail.name!}"></td>
-                                                    <td><input type="text" readonly
+                                                    <td width="80px"><input type="text" readonly
                                                                class="am-modal-prompt-input am-modal-prompt-input-income"
                                                                value="${incomeDetail.unit!}"></td>
-                                                    <td><input type="text" readonly
+                                                    <td width="100px"><input type="text" readonly
                                                                class="am-modal-prompt-input am-modal-prompt-input-income input-changeable-amount"
                                                                value="${incomeDetail.amount!0}"></td>
-                                                    <td><input type="text" readonly
+                                                    <td width="200px"><input type="text" readonly
                                                                class="am-modal-prompt-input am-modal-prompt-input-income input-changeable-price"
                                                                value="${Utils.format2(incomeDetail.price,'0.00')}"></td>
-                                                    <td><input type="text" readonly
+                                                    <td width="100px"> <input type="text" readonly
                                                                class="am-modal-prompt-input am-modal-prompt-input-income input-changeable-tax-rate"
                                                                value="${Utils.format(incomeDetail.taxRate,'0.00')}"></td>
-                                                    <td><input type="text"
+                                                    <td width="200px"><input type="text"
                                                                class="am-modal-prompt-input am-modal-prompt-input-income input-changeable-total-tax-include"
                                                                value="${Utils.format(incomeDetail.totalTaxInclude,'0.00')}"
                                                                readonly></td>
-                                                    <td><input type="text"
+                                                    <td width="200px"><input type="text"
                                                                class="am-modal-prompt-input am-modal-prompt-input-income input-changeable-total-tax-exclude"
                                                                value="${Utils.format(incomeDetail.totalTaxExclude,'0.00')}"
                                                                readonly></td>
@@ -536,7 +536,7 @@
                                             <td></td>
                                             <td><input type="text" class="am-modal-prompt-input am-modal-prompt-input-income input-changeable-total-total-tax-include-income" value="${Utils.format(budgetBean.incomeTotalTaxInclude,'0.00')}" readonly></td>
                                             <td><input type="text" class="am-modal-prompt-input am-modal-prompt-input-income input-changeable-total-total-tax-exclude-income" value="${Utils.format(budgetBean.incomeTotalTaxExclude,'0.00')}" readonly></td>
-                                            <td></td>
+                                            <#--<td></td>-->
                                         </tr>
                                         </tbody>
                                     </table>
@@ -587,7 +587,7 @@
                                                             其他
                                                         </#if>
                                                     </td>
-                                                    <td width="100px">
+                                                    <td width="120px">
                                                         <#list procurementTypes as procurementType>
                                                             <#if costDetail.category == procurementType.id>${procurementType.name}</#if>
                                                         </#list>
@@ -636,7 +636,7 @@
                                             <td></td>
                                             <td><input type="text" class="am-modal-prompt-input am-modal-prompt-input-cost input-changeable-total-total-tax-include-cost" value="${Utils.format(budgetBean.costPurchaseTotalTaxInclude,'0.00')}" readonly></td>
                                             <td><input type="text" class="am-modal-prompt-input am-modal-prompt-input-cost input-changeable-total-total-tax-exclude-cost" value="${Utils.format(budgetBean.costPurchaseTotalTaxExclude,'0.00')}" readonly></td>
-                                            <td></td>
+                                            <#--<td></td>-->
                                         </tr>
                                         </tbody>
                                     </table>
@@ -713,7 +713,7 @@
                                                     <td width="120px"><input type="text" readonly
                                                                class="am-modal-prompt-input am-modal-prompt-input-cost-project-manage"
                                                                value="${costProjectManageDetail.predictMethod!}"></td>
-                                                    <td width="80px"><input type="text" readonly
+                                                    <td width="100px"><input type="text" readonly
                                                                class="am-modal-prompt-input am-modal-prompt-input-cost-project-manage"
                                                                value="${costProjectManageDetail.predictWhy!}"></td>
                                                     <td width="60px"><input type="text" readonly
@@ -742,7 +742,7 @@
                                             <td></td>
                                             <td></td>
                                             <td></td>
-                                            <td></td>
+                                            <#--<td></td>-->
                                         </tr>
                                         </tbody>
                                     </table>