From 4273ae4d2d5974e34728af0a52f901af90fd7c1a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=98wangjiuyun?= <‘1595161655@qq.com>
Date: Fri, 20 Dec 2024 11:51:42 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AF=BC=E5=85=A5=E5=AE=8C=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../static/assets/js/project_budget.js        | 13 ++++--
 .../static/assets/js/project_budget_cost.js   |  2 +-
 .../templates/admin/project_approve.ftl       | 45 ++++++++++++++-----
 .../templates/admin/project_budget_edit.ftl   | 26 ++++++-----
 4 files changed, 59 insertions(+), 27 deletions(-)

diff --git a/src/main/resources/static/assets/js/project_budget.js b/src/main/resources/static/assets/js/project_budget.js
index a9cc31d..6bb83a9 100644
--- a/src/main/resources/static/assets/js/project_budget.js
+++ b/src/main/resources/static/assets/js/project_budget.js
@@ -393,6 +393,7 @@ function checkIfFillIn() {
     var signTypeBudget = $("#signTypeBudget").val();
     var calculationCollectionBudget = $("#calculationCollectionBudget").val();
 
+    var resolvePlanSynergy = $("#resolvePlanSynergy").val();
 
     if (name.length <= 0) {
         window.confirm('项目名称不能为空');
@@ -421,7 +422,11 @@ function checkIfFillIn() {
     //     return;
     // }
 
-
+    if (!resolvePlanSynergy) {
+        window.confirm('解决方案协同不能为空');
+        check = 1;
+        return;
+    }
     if (underwrittenMode > 2 && (advanceInterestAmount == undefined || advanceInterestAmount.length <= 0)) {
         window.confirm('垫资利息不能为空');
         check = 1;
@@ -1055,7 +1060,7 @@ function checkprojectPlan() {
 
 //根据收款计划表和付款计划表更新资金计划表日期范围
 function updataCostPlanMonth(data, key) {
-    if(!data.details.length) return
+    if (!data.details.length) return
     let nowMaxMonth = new Date($('#planEndStr').val()).getTime()
     let nowMinMonth = new Date($('#planStartStr').val()).getTime()
     let dataMonth = data.details
@@ -1066,7 +1071,7 @@ function updataCostPlanMonth(data, key) {
     let dataMin = new Date(dataMonth[dataMonth.length - 1][key]).getTime()
 
     if (!nowMaxMonth || !nowMinMonth) {
-        if(!nowMinMonth){
+        if (!nowMinMonth) {
             layui.use('laydate', function () {
                 var laydate = layui.laydate;
                 laydate.render({
@@ -1088,7 +1093,7 @@ function updataCostPlanMonth(data, key) {
                 });
             })
         }
-        if(!nowMaxMonth){
+        if (!nowMaxMonth) {
             $('#planEndStr').val(dataMonth[0][key].slice(0, 7))
             layui.use('laydate', function () {
                 var laydate = layui.laydate;
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 d3b838f..984dd9f 100644
--- a/src/main/resources/static/assets/js/project_budget_cost.js
+++ b/src/main/resources/static/assets/js/project_budget_cost.js
@@ -487,7 +487,7 @@ function  initRowDataCost(data){
         $('#costTable tbody .costaddtr:last').find('.input-changeable-tax-rate-cost-select').val('自定义')
         $('#costTable tbody .costaddtr:last').find('.input-changeable-tax-rate-cost-select')
         $('#costTable tbody .costaddtr:last').find('.input-changeable-tax-rate-cost-name').val(data.category)
-        $('#costTable tbody .costaddtr:last').find('.input-changeable-tax-rate-cost-name').trigger('change')
+        $('#costTable tbody .costaddtr:last').find('.input-changeable-tax-rate-cost-select').trigger('change')
     }else{
         $('#costTable tbody .costaddtr:last').find('.input-changeable-tax-rate-cost-select').val(data.category)
     }
diff --git a/src/main/resources/templates/admin/project_approve.ftl b/src/main/resources/templates/admin/project_approve.ftl
index 3343f48..7860935 100644
--- a/src/main/resources/templates/admin/project_approve.ftl
+++ b/src/main/resources/templates/admin/project_approve.ftl
@@ -165,11 +165,12 @@
         #tab3 {
             overflow-x: hidden;
         }
-        #tab34 table#budgetPlanDetailTable tbody{
+
+        #tab34 table#budgetPlanDetailTable tbody {
             /*padding-top: 15px;*/
         }
 
-        #tab34 table#budgetPlanDetailTable tr{
+        #tab34 table#budgetPlanDetailTable tr {
             position: relative;
             padding-top: 55px;
         }
@@ -263,7 +264,21 @@
                                         <input readonly value=""/>
                                     </#if>
                                 </td>
-                                <td class="table-title" colspan="3">
+                                <th class="table-title" colspan="1"><span style="font-size: 15px">解决方案协同:</span>
+                                </th>
+                                <td class="table-title" colspan="2">
+                                    <#if project.resolvePlanSynergy??>
+                                        <#if (project.resolvePlanSynergy)==true>
+                                            <input readonly value="是"/>
+                                        <#elseif (project.resolvePlanSynergy)==false>
+                                            <input readonly value="否"/>
+                                        <#else>
+                                            <input readonly value=""/>
+                                        </#if>
+                                    </#if>
+
+                                </td>
+
                             </tr>
                             <tr class="am-text-nowrap">
                                 <th class="table-title" colspan="1"><span style="font-size: 15px">垫资模式:</span></th>
@@ -1407,16 +1422,20 @@
                                                     onclick="location.href='${base}/project/budgetPlanExport?id=${project.id!}'">
                                                 <span class="am-icon-archive"></span> 导出
                                             </button>
-                                            <button type="button" class="am-btn am-btn-default openDetail" onclick="openDetail()">
+                                            <button type="button" class="am-btn am-btn-default openDetail"
+                                                    onclick="openDetail()">
                                                 <span class="am-icon-archive"></span> 拓展明细
                                             </button>
-                                            <button style="display: none" type="button" class="am-btn am-btn-default closeDetail" onclick="closeDetail()">
+                                            <button style="display: none" type="button"
+                                                    class="am-btn am-btn-default closeDetail" onclick="closeDetail()">
                                                 <span class="am-icon-archive"></span> 隐藏明细
                                             </button>
-                                            <button type="button" style="display: none" class="am-btn am-btn-default closeEmpty" onclick="closeEmpty()">
+                                            <button type="button" style="display: none"
+                                                    class="am-btn am-btn-default closeEmpty" onclick="closeEmpty()">
                                                 <span class="am-icon-archive"></span> 隐藏无金额月份
                                             </button>
-                                            <button type="button" class="am-btn am-btn-default openEmpty" onclick="openEmpty()">
+                                            <button type="button" class="am-btn am-btn-default openEmpty"
+                                                    onclick="openEmpty()">
                                                 <span class="am-icon-archive"></span> 展示无金额月份
                                             </button>
                                             <#--                                                <button type="button" class="am-btn am-btn-default" onclick="printPage('tab34')">-->
@@ -3956,7 +3975,7 @@
         // var tab32HeadH = $("#tab32").find('thead').get(0).offsetHeight
         // $("#tab32TBody").get(0).style.maxHeight = 'calc(100% - ' + tab32HeadH + 'px)'
         <#--.style.maxHeight = `calc(100% - ${tab32HeadH}px)`-->
-        $('.fixed-table tbody').css('max-height','calc(100% - 100px)')
+        $('.fixed-table tbody').css('max-height', 'calc(100% - 100px)')
     });
 
 
@@ -4135,7 +4154,9 @@
 
 
     }
+
     closeEmpty()
+
     function openEmpty() {
         $('.tr-budget-plan-empty').css('display', 'inline-block');
         $('.closeEmpty').css('display', 'inline-block');
@@ -4143,19 +4164,21 @@
 
 
     }
+
     $('#tab34').on('scroll', (event) => {
         let top = $('#tab34').scrollTop()
         let left = $('#tab34').scrollLeft()
 
-        $('#tab34 table tr td:nth-child(1)').css({'top':top>0?top-64:top,'left':left
+        $('#tab34 table tr td:nth-child(1)').css({
+            'top': top > 0 ? top - 64 : top, 'left': left
         })
         if (top > 0) {
             $('#tab34 table#budgetPlanDetailTable tr td:nth-child(1)').css({
-                'height':'55px'
+                'height': '55px'
             })
         } else {
             $('#tab34 table#budgetPlanDetailTable tr td:nth-child(1)').css({
-                'height':'auto'
+                'height': 'auto'
             })
         }
     })
diff --git a/src/main/resources/templates/admin/project_budget_edit.ftl b/src/main/resources/templates/admin/project_budget_edit.ftl
index e7e1fea..f112c57 100644
--- a/src/main/resources/templates/admin/project_budget_edit.ftl
+++ b/src/main/resources/templates/admin/project_budget_edit.ftl
@@ -517,7 +517,17 @@
                                         </option>
                                     </select>
                                 </td>
-                                <td class="table-title" colspan="3">
+                                <th class="table-title" colspan="1"><span style="color: red;">*</span><span
+                                        style="font-size: 15px">解决方案协同:</span></th>
+                                <td class="table-title" colspan="2">
+                                    <select data-am-selected="{btnSize: 'sm',btnWidth: '80%',searchBox: 1}"
+                                            id="resolvePlanSynergy" name="resolvePlanSynergy">
+                                        <option value="true" <#if projectBudget.resolvePlanSynergy==true>selected</#if>>是
+                                        </option>
+                                        <option value="false" <#if projectBudget.resolvePlanSynergy==false>selected</#if>>否
+                                        </option>
+                                    </select>
+                                </td>
                             </tr>
                             <tr class="am-text-nowrap">
                                 <th class="table-title" colspan="1"><span style="color: red;">*</span><span
@@ -2420,13 +2430,10 @@
                         var list = [...data.data.successList.map((ele)=> {
                             ele.result = ele.name + '(成功)'
                             return ele
-                        }),...data.data.errorList.map((ele)=> {
-                            ele.result = ele
-                            return ele
-                        })];
+                        }),...data.data.errorList];
                         var content = '';
                         $.each(list, function (i, r) {
-                            content += (i + 1) + '、' + r.result + '<br>';
+                            content += (i + 1) + '、' + (r.result||r) + '<br>';
                         });
                         console.log('---> ' + content);
                         parent.layer.open({
@@ -2475,13 +2482,10 @@
                         var list = [...data.data.successList.map((ele)=> {
                             ele.result = ele.category + '(成功)'
                             return ele
-                        }),...data.data.errorList.map((ele)=> {
-                            ele.result = ele
-                            return ele
-                        })];
+                        }),...data.data.errorList];
                         var content = '';
                         $.each(list, function (i, r) {
-                            content += (i + 1) + '、' + r.result + '<br>';
+                            content += (i + 1) + '、' + (r.result||r) + '<br>';
                         });
                         console.log('---> ' + content);
                         parent.layer.open({