应收报表

增加 超支，收款退还 列
web端和Excel 更改响应代码

OASystem/OASystem.Api/Controllers/FinancialController.cs

@@ -1712,7 +1712,7 @@ namespace OASystem.API.Controllers
                     item_rst.frPrice = sum_fr.ToString("#0.00");
                     item_rst.extraPrice = sum_extra.ToString("#0.00");
                     item_rst.receivableTotal = (sum_fr + sum_extra).ToString("#0.00");
-                    item_rst.prPrice = (sum_pr).ToString("#0.00");
+                    item_rst.prPrice = sum_pr.ToString("#0.00");
                     item_rst.refundAmount = sum_refund.ToString("#0.00");
                     item_rst.receivedTotal = (sum_pr - sum_refund).ToString("#0.00");
                     item_rst.balPrice = ((sum_fr + sum_extra) - (sum_pr - sum_refund)).ToString("#0.00");
@@ -1754,7 +1754,11 @@ namespace OASystem.API.Controllers
                         exc.ClientUnit = item.clientUnit;
                         exc.VisitDate = item.visitDate;
                         exc.Accounts = item.frPrice;
+                        exc.Extra = item.extraPrice;
+                        exc.ReceivableTotal = item.receivableTotal;
                         exc.Received = item.prPrice;
+                        exc.RefundAmount = item.refundAmount;
+                        exc.ReceivedTotal = item.receivedTotal;
                         exc.Balance = item.balPrice;
                         exc.Collection = item.schedule;
                         DateTime time = Convert.ToDateTime(item.visitDate);

OASystem/OASystem.Domain/ViewModels/Financial/Fin_ForeignReceivablesView.cs

@@ -264,11 +264,32 @@ namespace OASystem.Domain.ViewModels.Financial
         /// </summary>
         public string Accounts { get; set; }
 
+        /// <summary>
+        /// 超支
+        /// </summary>
+        public string Extra { get; set; }
+
+
+        /// <summary>
+        /// 应收总计(应收+超支)
+        /// </summary>
+        public string ReceivableTotal { get; set; }
+
         /// <summary>
         /// 已收
         /// </summary>
         public string Received { get; set; }
 
+        /// <summary>
+        /// 收款退还
+        /// </summary>
+        public string RefundAmount { get; set; }
+
+        /// <summary>
+        /// 已收合计(已收 - 收款退还)
+        /// </summary>
+        public string ReceivedTotal { get; set; }
+
         /// <summary>
         /// 余款
         /// </summary>