From 2fdccaa30cb442777636db3b52e9c73a5ec3d4f4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=98wangjiuyun?= <‘1595161655@qq.com>
Date: Fri, 20 Dec 2024 11:01:17 +0800
Subject: [PATCH] =?UTF-8?q?=E9=87=87=E8=B4=AD=E5=92=8C=E6=94=B6=E5=85=A5?=
 =?UTF-8?q?=E5=AF=BC=E5=85=A5=E5=8A=9F=E8=83=BD=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../static/assets/js/project_budget.js        |  4 +-
 .../static/assets/js/project_budget_cost.js   | 31 ++++++++++--
 .../static/assets/js/project_budget_income.js | 23 ++++++++-
 .../templates/admin/project_budget_edit.ftl   | 48 +++++++++++++------
 4 files changed, 83 insertions(+), 23 deletions(-)

diff --git a/src/main/resources/static/assets/js/project_budget.js b/src/main/resources/static/assets/js/project_budget.js
index fa38946..a9cc31d 100644
--- a/src/main/resources/static/assets/js/project_budget.js
+++ b/src/main/resources/static/assets/js/project_budget.js
@@ -764,14 +764,14 @@ function bindChangeableInput() {
     $(".input-changeable-tax-rate").change(function () {
         var taxRate = f2($(this).val());
         var rowVal = $(this).parent().parent().find(".input-changeable-total-tax-include").val()
-        $(this).parent().parent().find(".input-changeable-total-tax-exclude").val(f2Fixed(rowVal * (1 - (taxRate / 100))));
+        $(this).parent().parent().find(".input-changeable-total-tax-exclude").val(f2Fixed(rowVal / (1 + (taxRate / 100))));
         $(this).parent().parent().find(".input-changeable-total-tax").val(f2Fixed(rowVal * (taxRate / 100)));
     });
     // 不含税金额改变
     $(".input-changeable-total-tax-include").change(function () {
         var rowVal = f2($(this).val());
         var taxRate = $(this).parent().parent().find(".input-changeable-tax-rate").val()
-        $(this).parent().parent().find(".input-changeable-total-tax-exclude").val(f2Fixed(rowVal * (1 - (taxRate / 100))));
+        $(this).parent().parent().find(".input-changeable-total-tax-exclude").val(f2Fixed(rowVal / (1 + (taxRate / 100))));
         $(this).parent().parent().find(".input-changeable-total-tax").val(f2Fixed(rowVal * (taxRate / 100)));
     });
 }
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 485ae42..d3b838f 100644
--- a/src/main/resources/static/assets/js/project_budget_cost.js
+++ b/src/main/resources/static/assets/js/project_budget_cost.js
@@ -169,14 +169,14 @@ $(function () {
 /**
  * 采购成本增加一行
  */
-function appendTrCost() {
+function appendTrCost(dataRow) {
     //console.log(SELECT_TYPE_CATEGORY_DATA);
     var options = '<option value="xxxx" disabled selected>--请选择--</option>\r\n';
     SELECT_TYPE_CATEGORY_DATA.forEach(function (e) {
         options += '<option value="' + e.id + '">' + e.name + '</option>\r\n';
     });
 
-    var template = '<tr>' +
+    var template = '<tr class="costaddtr">' +
         '<td width="60px"><input type="text" class="am-modal-prompt-input am-modal-prompt-input-cost input-budget-num" readonly></td>' +
         '<td width="70px"><select style="float: left;" class="am-modal-prompt-input am-modal-prompt-input-cost am-modal-prompt-input-cost-type">' +
         '<option value="xxxx" disabled selected>--请选择--</option>' +
@@ -196,8 +196,8 @@ function appendTrCost() {
     '<td width="100px"><input type="text" class="am-modal-prompt-input am-modal-prompt-input-cost input-changeable-total-tax-include input-changeable-total-tax-include-cost"></td>' +
     '<td width="100px"><input type="text" class="am-modal-prompt-input am-modal-prompt-input-cost input-changeable-total-tax-exclude input-changeable-total-tax-exclude-cost" readonly></td>' +
     '<td width="100px"><input type="text" class="am-modal-prompt-input am-modal-prompt-input-cost input-changeable-total-tax input-changeable-total-tax-cost" readonly></td>' +
-    '<td width="100px"><input type="text" class="am-modal-prompt-input am-modal-prompt-input-cost" ></td>\n' +
-        '<td width="100px"><input type="text" class="am-modal-prompt-input am-modal-prompt-input-cost" ></td>\n' +
+    '<td width="100px"><input type="text" class="am-modal-prompt-input am-modal-prompt-input-cost am-modal-prompt-input-cost-contractParty" ></td>\n' +
+        '<td width="100px"><input type="text" class="am-modal-prompt-input am-modal-prompt-input-cost am-modal-prompt-input-cost-remark" ></td>\n' +
     '<td width="60px"><button type="button" style="margin-top: 10px" class="am-btn am-btn-danger am-btn-xs am-round am-modal-line-delete"><span class="am-icon-minus"></span></button></td>' +
     '</tr>';
 
@@ -220,6 +220,9 @@ function appendTrCost() {
     if ($('#costTable').find('tbody') && $('#costTable').find('tbody')[0]) {
         $('#costTable').find('tbody')[0].scrollTop = $('#costTable').find('tbody')[0].scrollHeight
     }
+    if(dataRow.type){
+        initRowDataCost(dataRow)
+    }
 }
 
 /**
@@ -476,5 +479,25 @@ function initTypeCategory(params, data) {
     // console.log(SELECT_TYPE_CATEGORY_MAP_DATA);
     // console.log(SELECT_TYPE_CATEGORY_DATA);
     // console.log(SELECT_CATEGORY_TYPE_MAP_DATA);
+
+}
+function  initRowDataCost(data){
+    $('#costTable tbody .costaddtr:last').find('.am-modal-prompt-input-cost-type').val(data.type)
+    if(data.category!='华智产品'&&data.category!='华三产品'&&data.category!='汇智产品' ){
+        $('#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')
+    }else{
+        $('#costTable tbody .costaddtr:last').find('.input-changeable-tax-rate-cost-select').val(data.category)
+    }
+    $('#costTable tbody .costaddtr:last').find('.input-changeable-tax-rate-cost').val(data.taxRate)
+    $('#costTable tbody .costaddtr:last').find('.input-changeable-total-tax-include-cost').val(data.totalTaxInclude)
+    $('#costTable tbody .costaddtr:last').find('.input-changeable-total-tax-exclude-cost').val(data.totalTaxExclude)
+    $('#costTable tbody .costaddtr:last').find('.input-changeable-total-tax-cost').val(data.totalTax)
+    $('#costTable tbody .costaddtr:last').find('.am-modal-prompt-input-cost-contractParty').val(data.contractParty)
+    $('#costTable tbody .costaddtr:last').find('.am-modal-prompt-input-cost-remark').val(data.remark)
+
+    $('#costTable tbody .costaddtr:last').find('.input-changeable-total-tax-include-cost').trigger('change')
 }
 
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 1e7bf88..71dbac4 100644
--- a/src/main/resources/static/assets/js/project_budget_income.js
+++ b/src/main/resources/static/assets/js/project_budget_income.js
@@ -157,8 +157,8 @@ function updateIncomeData(data, returnData) {
 /**
  * 收入明细增加一行
  */
-function appendTrIncome() {
-    var template = '<tr>\n' +
+function appendTrIncome(dataRow) {
+    var template = '<tr class="incomeaddtr">\n' +
         '                        <td><input type="text" class="am-modal-prompt-input am-modal-prompt-input-income input-budget-num" readonly></td>\n' +
         '                        <td width="100px">\n' +
         '                            <select style="float: left;" class="am-modal-prompt-input am-modal-prompt-input-income am-modal-prompt-input-income-type">\n' +
@@ -192,6 +192,9 @@ function appendTrIncome() {
     if ($('#incomeTable').find('tbody') && $('#incomeTable').find('tbody')[0]) {
         $('#incomeTable').find('tbody')[0].scrollTop = $('#incomeTable').find('tbody')[0].scrollHeight
     }
+    if(dataRow.type){
+        initRowData(dataRow)
+    }
 }
 
 /**
@@ -261,6 +264,22 @@ function bindTypeSelectChangeIncome() {
         nameSelect.attr("style", "display:block");
         nameInput.attr("type", "hidden");
     })
+}
 
+function  initRowData(data){
 
+    $('#incomeTable tbody .incomeaddtr:last').find('.am-modal-prompt-input-income-type').val(data.type)
+    if(data.name!='华智产品'&&data.name!='华三产品'&&data.name!='汇智产品' ){
+        $('#incomeTable tbody .incomeaddtr:last').find('.input-changeable-tax-rate-income-select').val('自定义')
+        $('#incomeTable tbody .incomeaddtr:last').find('.input-changeable-tax-rate-income-select')
+        $('#incomeTable tbody .incomeaddtr:last').find('.input-changeable-tax-rate-income-name').val(data.name)
+        $('#incomeTable tbody .incomeaddtr').last().find('.input-changeable-tax-rate-income-select').trigger('change')
+    }else{
+        $('#incomeTable tbody .incomeaddtr:last').find('.input-changeable-tax-rate-income-select').val(data.name)
+    }
+    $('#incomeTable tbody .incomeaddtr:last').find('.input-changeable-tax-rate-income').val(data.taxRate)
+    $('#incomeTable tbody .incomeaddtr:last').find('.input-changeable-total-tax-include-income').val(data.totalTaxInclude)
+    $('#incomeTable tbody .incomeaddtr:last').find('.input-changeable-total-tax-exclude-income').val(data.totalTaxExclude)
+    $('#incomeTable tbody .incomeaddtr:last').find('.input-changeable-total-tax-income').val(data.totalTax)
+    $('#incomeTable tbody .incomeaddtr:last').find('.input-changeable-total-tax-include-income').trigger('change')
 }
\ No newline at end of file
diff --git a/src/main/resources/templates/admin/project_budget_edit.ftl b/src/main/resources/templates/admin/project_budget_edit.ftl
index aaa5b29..464dd81 100644
--- a/src/main/resources/templates/admin/project_budget_edit.ftl
+++ b/src/main/resources/templates/admin/project_budget_edit.ftl
@@ -908,10 +908,11 @@
                                                 <button type="button" id="bt_import" class="am-btn am-btn-default">
                                                     <span class="am-icon-archive"></span>
                                                     批量导入
+                                                    <input id="doc-form-file" type="file" name="file"
+                                                           onChange="ajaxUploadFile('doc-form-file','${base}/project/batchIncomeImport?id=' + ${project.id})">
+
                                                 </button>
-                                                <input id="doc-form-file" type="file" name="file"
-                                                       onChange="ajaxUploadFile('doc-form-file','${base}/project/batchIncomeImport?id=' + ${project.id})">
-                                            </div>
+                                       </div>
 
                                             <button type="button" class="am-btn am-btn-default"
                                                     onclick="location.href='${base}/project/incomeTemplate'">
@@ -1131,10 +1132,11 @@
                                                 <button type="button" id="bt_import" class="am-btn am-btn-default">
                                                     <span class="am-icon-archive"></span>
                                                     批量导入
+                                                    <input id="doc-form-file2" type="file" name="file"
+                                                           onChange="ajaxUploadFile2('doc-form-file2','${base}/project/batchCostImport?id=' + ${project.id})">
+
                                                 </button>
-                                                <input id="doc-form-file2" type="file" name="file"
-                                                       onChange="ajaxUploadFile2('doc-form-file2','${base}/project/batchCostImport?id=' + ${project.id})">
-                                            </div>
+                                               </div>
 
                                             <button type="button" class="am-btn am-btn-default"
                                                     onclick="location.href='${base}/project/costTemplate'">
@@ -2410,16 +2412,21 @@
                 fileElementId: id,// file标签的id
                 dataType: 'json',// 返回数据的类型
                 success: function (data, status) {
-                    console.log("--------success---------" , data)
                     // if($('#modal')){
                     //     $('#modal').modal('close');
                     //     $('#span-'+id).html("导入完成");
                     // }
                     if (data.status == 0) {
-                        var list = data.data;
+                        var list = [...data.data.successList.map((ele)=> {
+                            ele.result = ele.name + '(成功)'
+                            return ele
+                        }),...data.data.errorList.map((ele)=> {
+                            ele.result = ele.name + '(失败)'
+                            return ele
+                        })];
                         var content = '';
                         $.each(list, function (i, r) {
-                            content += (i + 1) + '、' + r + '<br>';
+                            content += (i + 1) + '、' + r.result + '<br>';
                         });
                         console.log('---> ' + content);
                         parent.layer.open({
@@ -2429,13 +2436,16 @@
                     } else {
                         parent.layer.msg(data.msg);
                     }
+                    data.data.successList.forEach((ele)=>{
+                        appendTrIncome(ele)
 
-                    window.location.reload();
+                    })
+                    // window.location.reload();
                     $("#" + id).val("");
                 },
                 error: function (data, status, e) {
                     console.log("--------error---------" + data)
-                    layer.alert("-----------------" + data);
+                    // layer.alert("-----------------" + data);
                     // if ($('#modal')) {
                     //     $('#modal').modal('close');
                     // }
@@ -2456,16 +2466,22 @@
                 fileElementId: id,// file标签的id
                 dataType: 'json',// 返回数据的类型
                 success: function (data, status) {
-                    console.log("--------success---------" + data)
+                    console.log("--------success---------" ,JSON.stringify(data.data))
                     // if($('#modal')){
                     //     $('#modal').modal('close');
                     //     $('#span-'+id).html("导入完成");
                     // }
                     if (data.status == 0) {
-                        var list = data.data;
+                        var list = [...data.data.successList.map((ele)=> {
+                            ele.result = ele.category + '(成功)'
+                            return ele
+                        }),...data.data.errorList.map((ele)=> {
+                            ele.result = ele.category + '(失败)'
+                            return ele
+                        })];
                         var content = '';
                         $.each(list, function (i, r) {
-                            content += (i + 1) + '、' + r + '<br>';
+                            content += (i + 1) + '、' + r.result + '<br>';
                         });
                         console.log('---> ' + content);
                         parent.layer.open({
@@ -2475,8 +2491,10 @@
                     } else {
                         parent.layer.msg(data.msg);
                     }
+                    data.data.successList.forEach((ele)=>{
+                        appendTrCost(ele)
 
-                    window.location.reload();
+                    })
                     $("#" + id).val("");
                 },
                 error: function (data, status, e) {