From 8dbc72267440da70002ca3f567632d9a58c5e462 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=A5=9E=E8=AF=9D?= <752718920@qq.com>
Date: Thu, 28 Apr 2022 20:24:53 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=99=E5=85=B3=E8=81=94=E5=8D=95=E6=8D=AE?=
 =?UTF-8?q?=E9=80=89=E6=8B=A9=E5=88=97=E8=A1=A8=E4=B8=AD=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E5=90=AB=E7=A8=8E=E9=87=91=E9=A2=9D=E7=9A=84=E5=88=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jshERP-web/src/views/bill/dialog/LinkBillList.vue | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/jshERP-web/src/views/bill/dialog/LinkBillList.vue b/jshERP-web/src/views/bill/dialog/LinkBillList.vue
index 9f581953..4ab5bf0a 100644
--- a/jshERP-web/src/views/bill/dialog/LinkBillList.vue
+++ b/jshERP-web/src/views/bill/dialog/LinkBillList.vue
@@ -76,9 +76,14 @@
               }
             }
           },
-          { title: '单据日期', dataIndex: 'operTimeStr',width:145},
+          { title: '单据日期', dataIndex: 'operTimeStr',width:135},
           { title: '操作员', dataIndex: 'userName',width:70},
           { title: '金额合计', dataIndex: 'totalPrice',width:70},
+          { title: '含税合计', dataIndex: 'totalTaxLastMoney',width:80,
+            customRender:function (text,record,index) {
+              return (record.discountMoney + record.discountLastMoney).toFixed(2);
+            }
+          },
           { title: '状态', dataIndex: 'status', width: 70, align: "center",
             scopedSlots: { customRender: 'customRenderStatus' }
           }