From c9c0bbc582262cb17c6ade24d150eb8e5bd55e97 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=A3=E5=9C=A3=E5=8D=8E?= <752718920@qq.com>
Date: Sun, 10 Oct 2021 17:17:48 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E7=BB=84=E8=A3=85=E6=8B=86?=
 =?UTF-8?q?=E5=8D=B8=E5=8D=95=E7=9A=84=E5=A4=9A=E9=80=89=E5=95=86=E5=93=81?=
 =?UTF-8?q?=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jshERP-web/src/views/bill/mixins/BillModalMixin.js | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/jshERP-web/src/views/bill/mixins/BillModalMixin.js b/jshERP-web/src/views/bill/mixins/BillModalMixin.js
index ca99eff8..2d83d287 100644
--- a/jshERP-web/src/views/bill/mixins/BillModalMixin.js
+++ b/jshERP-web/src/views/bill/mixins/BillModalMixin.js
@@ -278,6 +278,12 @@ export const BillModalMixin = {
                   let taxLastMoneyTotal = 0
                   for (let j = 0; j < mArr.length; j++) {
                     taxLastMoneyTotal += mArr[j].taxLastMoney-0
+                    //组合和拆分单据给商品类型进行重新赋值
+                    if(j===0) {
+                      mArr[0].mType = '组合件'
+                    } else {
+                      mArr[j].mType = '普通子件'
+                    }
                   }
                   this.materialTable.dataSource = mArr
                   target.statisticsColumns.taxLastMoney = taxLastMoneyTotal