From f12d3d1203f07493190730891d952d2ab266bd98 Mon Sep 17 00:00:00 2001
From: xxssyyyyssxx <xxssyyyyssxx@126.com>
Date: Wed, 8 Dec 2021 16:35:49 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=8D=E8=87=AA=E5=8A=A8=E5=85=B3=E9=97=AD?=
 =?UTF-8?q?=E5=AF=B9=E8=AF=9D=E6=A1=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/resources/static/assets/js/project_budget_cost.js  | 1 +
 .../static/assets/js/project_budget_cost_project_manage.js  | 1 +
 .../resources/static/assets/js/project_budget_income.js     | 1 +
 src/main/resources/templates/admin/project_budget_edit.ftl  | 6 +++---
 4 files changed, 6 insertions(+), 3 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 bbe7909..2b9a8a0 100644
--- a/src/main/resources/static/assets/js/project_budget_cost.js
+++ b/src/main/resources/static/assets/js/project_budget_cost.js
@@ -68,6 +68,7 @@ $(function () {
     $("#cost-detail").click(function () {
         $('#my-prompt-cost-detail').modal({
             relatedTarget: this,
+            closeOnConfirm:false,
             onConfirm: function(e) {
                 //不能使用e.data，因为无法获取动态添加的
                 var data = collectData("am-modal-prompt-input-cost");
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 6a61c93..d7cf51f 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
@@ -6,6 +6,7 @@ $(function () {
     $("#cost-project-manage-detail").click(function () {
         $('#my-prompt-cost-project-manage-detail').modal({
             relatedTarget: this,
+            closeOnConfirm:false,
             onConfirm: function(e) {
                 //不能使用e.data，因为无法获取动态添加的
                 var data = collectData("am-modal-prompt-input-cost-project-manage");
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 b718a04..de25a0d 100644
--- a/src/main/resources/static/assets/js/project_budget_income.js
+++ b/src/main/resources/static/assets/js/project_budget_income.js
@@ -7,6 +7,7 @@ $(function () {
     $("#income-detail").click(function () {
         $('#my-prompt-income-detail').modal({
             relatedTarget: this,
+            closeOnConfirm:false,
             onConfirm: function(e) {
                 //不能使用e.data，因为无法获取动态添加的
                 var data = collectData("am-modal-prompt-input-income");
diff --git a/src/main/resources/templates/admin/project_budget_edit.ftl b/src/main/resources/templates/admin/project_budget_edit.ftl
index e84cf83..4f5ab26 100644
--- a/src/main/resources/templates/admin/project_budget_edit.ftl
+++ b/src/main/resources/templates/admin/project_budget_edit.ftl
@@ -421,7 +421,7 @@
     <#--收入明细表弹窗-->
     <div class="am-modal am-modal-prompt" style="width: 1200px;max-height:600px;overflow-y:auto;" tabindex="-1" id="my-prompt-income-detail">
         <div class="am-modal-dialog">
-            <div class="am-modal-hd">新增销售收入明细表——${project.name}</div>
+            <div class="am-modal-hd">新增销售收入明细表——${project.name}<a href="javascript: void(0)" class="am-close<#-- am-close-spin-->" data-am-modal-close>&times;</a></div>
             <div class="am-modal-bd">
                 <table class="am-table am-table-bordered am-table-radius table-main" style="padding:0;" id="incomeTable">
                     <tbody>
@@ -472,7 +472,7 @@
     <#--采购成本明细弹窗-->
     <div class="am-modal am-modal-prompt" style="width: 1200px;max-height:600px;overflow-y:auto;" tabindex="-1" id="my-prompt-cost-detail">
         <div class="am-modal-dialog">
-            <div class="am-modal-hd">新增采购成本明细表——${project.name}</div>
+            <div class="am-modal-hd">新增采购成本明细表——${project.name}<a href="javascript: void(0)" class="am-close<#-- am-close-spin-->" data-am-modal-close>&times;</a></div>
             <div class="am-modal-bd">
                 <table class="am-table am-table-bordered am-table-radius table-main" style="padding:0;" id="costTable">
                     <tbody>
@@ -540,7 +540,7 @@
     <#--项目管理明细表弹窗-->
     <div class="am-modal am-modal-prompt" style="width: 1200px;max-height:600px;overflow-y:auto;" tabindex="-1" id="my-prompt-cost-project-manage-detail">
         <div class="am-modal-dialog">
-            <div class="am-modal-hd">新增项目管理成本明细表——${project.name}</div>
+            <div class="am-modal-hd">新增项目管理成本明细表——${project.name}<a href="javascript: void(0)" class="am-close<#-- am-close-spin-->" data-am-modal-close>&times;</a></div>
             <div class="am-modal-bd">
                 <table class="am-table am-table-bordered am-table-radius table-main" style="padding:0;" id="costProjectManageTable">
                     <tbody>