From 35e8f01d1c147b91c30294582079674878fb5ae1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=98wangjiuyun?= <‘1595161655@qq.com>
Date: Mon, 28 Oct 2024 20:31:15 +0800
Subject: [PATCH] =?UTF-8?q?=E5=89=8D=E7=AB=AF=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/resources/static/assets/js/project_budget_pay.js  | 4 ++--
 src/main/resources/templates/admin/project_budget_edit.ftl | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main/resources/static/assets/js/project_budget_pay.js b/src/main/resources/static/assets/js/project_budget_pay.js
index 7f3c174..15253f8 100644
--- a/src/main/resources/static/assets/js/project_budget_pay.js
+++ b/src/main/resources/static/assets/js/project_budget_pay.js
@@ -8,7 +8,7 @@ pay_DETAIL2={
     "payTime":[false,"付款时间","string"],
     "payProject":[false,"采购成本项目","number"],
     "payAmount":[false,"付款金额","number"],
-    "supplier":[false,"供应商","number"],
+    "supplier":[false,"供应商","string"],
 };
 
 pay_DETAIL={
@@ -17,7 +17,7 @@ pay_DETAIL={
     "payTime":[false,"付款时间","string"],
     "payProject":[false,"采购成本项目","number"],
     "payAmount":[false,"付款金额","number"],
-    "supplier":[false,"供应商","number"],
+    "supplier":[false,"供应商","string"],
 };
 /*
 [
diff --git a/src/main/resources/templates/admin/project_budget_edit.ftl b/src/main/resources/templates/admin/project_budget_edit.ftl
index 95e0d76..e36e8cc 100644
--- a/src/main/resources/templates/admin/project_budget_edit.ftl
+++ b/src/main/resources/templates/admin/project_budget_edit.ftl
@@ -1517,7 +1517,7 @@
                                             <tr>
                                                 <td width="60px"><input type="text" class="am-modal-prompt-input am-modal-prompt-input-pay input-budget-num" value="${(payDetail_index+1)!}" readonly></td>
                                                 <td width="100px"><input type="text"  class="am-modal-prompt-input am-modal-prompt-input-pay  input-changeable-pay-point" value="${payDetail.payPoint}" ></td>
-                                                <td width="100px"><input type="text"  class="am-modal-prompt-input am-modal-prompt-input-pay  input-changeable-pay-time" value="${payDetail.payTime}" ></td>
+                                                <td width="100px"><input type="text"  class="am-modal-prompt-input am-modal-prompt-input-pay  input-changeable-pay-time" value="${(payDetail.payTime?string("yyyy-MM-dd"))!}" data-am-datepicker ></td>
                                                 <td width="100px">
                                                     <select style="float: left;" class="am-modal-prompt-input am-modal-prompt-input-pay input-changeable-pay-project">
                                                         <option value="1" <#if payDetail.type == 1>selected</#if>>设备成本</option>