From e3837616d4760411e6f277b75e80f463d95789a6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=A3=E5=9C=A3=E5=8D=8E?= <752718920@qq.com>
Date: Mon, 22 Jun 2020 00:06:07 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E4=BE=9B=E5=BA=94=E5=95=86?=
 =?UTF-8?q?=E5=AF=B9=E8=B4=A6=E9=87=8C=E9=9D=A2=E7=9A=84=E5=8D=95=E6=8D=AE?=
 =?UTF-8?q?=E5=B1=95=E7=A4=BAbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 erp_web/js/pages/materials/bill_detail.js | 24 +++++++++++++++--------
 1 file changed, 16 insertions(+), 8 deletions(-)

diff --git a/erp_web/js/pages/materials/bill_detail.js b/erp_web/js/pages/materials/bill_detail.js
index 35562a29..a127b801 100644
--- a/erp_web/js/pages/materials/bill_detail.js
+++ b/erp_web/js/pages/materials/bill_detail.js
@@ -237,24 +237,32 @@
                         $("#bill .DebtShow").text((data.discountlastmoney+data.othermoney-data.changeamount).toFixed(2));
                         $("#bill .OtherMoneyShow").text(data.othermoney==null ? "": data.othermoney);
                         $("#bill .AccountDayShow").text(data.accountday==null ? "": data.accountday); //结算天数
-                        var otherMoney = data.othermoney + "";
-                        var otherMoneyList = data.othermoneylist + "";
-                        var otherMoneyItem = data.othermoneyitem + "";
-                        if(otherMoneyList && otherMoneyItem){
-                            var itemArr = otherMoneyList.split(","); //支出项目id列表
-                            var itemMoneyArr = otherMoneyItem.split(","); //支出项目金额列表
+                        if(data.othermoney && data.othermoneylist && data.othermoneyitem) {
+                            var itemArr = data.othermoneylist.split(","); //支出项目id列表
+                            var itemMoneyArr = null;
+                            if (data.othermoneyitem != null) {
+                                itemMoneyArr = eval("([" + data.othermoneyitem + "])");  //支出项目金额列表
+                            }
                             var otherMoneyShow = "";
                             for(var j =0;j<itemArr.length; j++) {
                                 if (outItemList != null) {
                                     for (var i = 0; i < outItemList.length; i++) {
                                         var money = outItemList[i];
                                         if(itemArr[j] == money.Id) {
-                                            otherMoneyShow = otherMoneyShow + money.InOutItemName + "(" + itemMoneyArr[j] +"元) ";
+                                            for(var k =0;k<itemMoneyArr.length; k++) {
+                                                if(itemMoneyArr[k].otherId == money.Id) {
+                                                    otherMoneyShow += money.InOutItemName;
+                                                    if(itemMoneyArr[k].otherMoney) {
+                                                        otherMoneyShow +="(" + itemMoneyArr[k].otherMoney +"元)";
+                                                    }
+                                                    otherMoneyShow+="，";
+                                                }
+                                            }
                                         }
                                     }
                                 }
                             }
-                            $("#bill .OtherMoneyShow:visible").text(otherMoneyShow +"总计："+ otherMoney.replace("undefined","0") + "元 "); //其它费用
+                            $("#bill .OtherMoneyShow:visible").text(otherMoneyShow +"总计："+ data.othermoney + "元 "); //其它费用
                         }
                         $("#bill .payTypeShow").text(data.payType);
                         var TotalPrice = data.totalprice;