From 59b0ab3100ce0a5bbbd364b35763ebb8adaa2b2e Mon Sep 17 00:00:00 2001
From: xxssyyyyssxx <xxssyyyyssxx@126.com>
Date: Wed, 1 Dec 2021 18:58:47 +0800
Subject: [PATCH] =?UTF-8?q?=E9=80=89=E6=8B=A9=E6=A1=86=E5=9B=BA=E5=AE=9A?=
 =?UTF-8?q?=E5=AE=BD=E5=BA=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../static/assets/js/project_budget_cost.js          |  4 ++--
 .../assets/js/project_budget_cost_project_manage.js  |  2 +-
 .../static/assets/js/project_budget_income.js        |  2 +-
 .../templates/admin/project_budget_edit.ftl          | 12 ++++++------
 4 files changed, 10 insertions(+), 10 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 381dda3..8997e3c 100644
--- a/src/main/resources/static/assets/js/project_budget_cost.js
+++ b/src/main/resources/static/assets/js/project_budget_cost.js
@@ -100,7 +100,7 @@ function appendTrCost() {
         options+='<option value="'+e.id+'">'+e.name+'</option>\r\n';
     });
 
-    var template = '<tr><td><select style="width: auto;float: left;" class="am-modal-prompt-input am-modal-prompt-input-cost am-modal-prompt-input-cost-type">'+
+    var template = '<tr><td><select style="width: 50px;float: left;" class="am-modal-prompt-input am-modal-prompt-input-cost am-modal-prompt-input-cost-type">'+
         '<option value="xxxx" disabled selected>--请选择--</option>'+
         '<option value="1">设备</option>'+
         '<option value="2">施工</option>'+
@@ -109,7 +109,7 @@ function appendTrCost() {
         '</select>'+
         '</td>'+
         '<td>'+
-        '<select style="width: auto;float: left;" class="am-modal-prompt-input am-modal-prompt-input-cost am-modal-prompt-input-cost-category">'+
+        '<select style="width: 80px;float: left;" class="am-modal-prompt-input am-modal-prompt-input-cost am-modal-prompt-input-cost-category">'+
 
         /*'<option value="1">华智产品</option>'+
         '<option value="2">紫光其他产品</option>'+
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 8ce5850..91866b3 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
@@ -29,7 +29,7 @@ $(function () {
 function appendTrCostProjectManage() {
     var template = '<tr>\n' +
         '        <td>\n' +
-        '            <select style="width: auto;float: left;" class="am-modal-prompt-input am-modal-prompt-input-cost-project-manage">\n' +
+        '            <select style="width: 80px;float: left;" class="am-modal-prompt-input am-modal-prompt-input-cost-project-manage">\n' +
         '                <option value="1" >人工成本</option>\n' +
         '                <option value="2" >业务费用</option>\n' +
         '                <option value="3" >其他费用</option>\n' +
diff --git a/src/main/resources/static/assets/js/project_budget_income.js b/src/main/resources/static/assets/js/project_budget_income.js
index 206a119..75b758f 100644
--- a/src/main/resources/static/assets/js/project_budget_income.js
+++ b/src/main/resources/static/assets/js/project_budget_income.js
@@ -79,7 +79,7 @@ function updateIncomeData(data,returnData) {
 function appendTrIncome() {
     var template = '<tr>\n' +
         '                        <td>\n' +
-        '                            <select style="width: auto;float: left;" class="am-modal-prompt-input am-modal-prompt-input-income">\n' +
+        '                            <select style="width: 80px;float: left;" class="am-modal-prompt-input am-modal-prompt-input-income">\n' +
         '                                <option value="1">设备类</option>\n' +
         '                                <option value="2">工程类</option>\n' +
         '                                <option value="3">服务类</option>\n' +
diff --git a/src/main/resources/templates/admin/project_budget_edit.ftl b/src/main/resources/templates/admin/project_budget_edit.ftl
index 86bc2bf..6850923 100644
--- a/src/main/resources/templates/admin/project_budget_edit.ftl
+++ b/src/main/resources/templates/admin/project_budget_edit.ftl
@@ -60,7 +60,7 @@
                             <i class="am-icon-calendar"></i>
                             <input type="text" class="am-form-field am-input-sm" id="startDate"
                                    name="startDate" autocomplete="off"
-                                   value="${project.startDate}" placeholder="项目计划开始时间"
+                                   value="${project.startDate?string("yyyy-MM")}" placeholder="项目计划开始时间"
                                    data-am-datepicker>
                         </div>
                     </div>
@@ -73,7 +73,7 @@
                             <i class="am-icon-calendar"></i>
                             <input type="text" class="am-form-field am-input-sm" id="endDate"
                                    name="endDate" autocomplete="off"
-                                   value="${project.endDate}" placeholder="项目计划结束时间"
+                                   value="${project.endDate?string("yyyy-MM")}" placeholder="项目计划结束时间"
                                    data-am-datepicker>
                         </div>
                     </div>
@@ -441,7 +441,7 @@
                         <#list incomeDetails as incomeDetail>
                         <tr>
                             <td>
-                                <select style="width: auto;float: left;" class="am-modal-prompt-input am-modal-prompt-input-income">
+                                <select style="width: 80px;float: left;" class="am-modal-prompt-input am-modal-prompt-input-income">
                                     <option value="1" <#if incomeDetail.type == 1>selected</#if>>设备类</option>
                                     <option value="2" <#if incomeDetail.type == 2>selected</#if>>工程类</option>
                                     <option value="3" <#if incomeDetail.type == 3>selected</#if>>服务类</option>
@@ -493,7 +493,7 @@
                         <#list costDetails as costDetail>
                         <tr>
                             <td>
-                                <select style="width: auto;float: left;" class="am-modal-prompt-input am-modal-prompt-input-cost am-modal-prompt-input-cost-type">
+                                <select style="width: 80px;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>
@@ -501,7 +501,7 @@
                                 </select>
                             </td>
                             <td>
-                                <select style="width: auto;float: left;" class="am-modal-prompt-input am-modal-prompt-input-cost am-modal-prompt-input-cost-category">
+                                <select style="width: 80px;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>
@@ -562,7 +562,7 @@
                             <#list costProjectManageDetails as costProjectManageDetail>
                             <tr>
                                 <td>
-                                    <select style="width: auto;float: left;" class="am-modal-prompt-input am-modal-prompt-input-cost-project-manage" <#if costProjectManageDetail.deletable==0>readonly</#if>>
+                                    <select style="width: 80px;float: left;" class="am-modal-prompt-input am-modal-prompt-input-cost-project-manage" <#if costProjectManageDetail.deletable==0>readonly</#if>>
                                         <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>