From 491a74e42497c8bceeda8a6860c49a19c0ea62ff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=A3=E5=9C=A3=E5=8D=8E?= <752718920@qq.com>
Date: Sat, 7 Aug 2021 01:41:23 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=AF=E6=8C=81=E9=80=89=E6=8B=A9=E5=A4=9A?=
 =?UTF-8?q?=E5=95=86=E5=93=81=EF=BC=88=E4=BC=98=E5=8C=96=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/bill/mixins/BillModalMixin.js   | 96 +++++++++----------
 1 file changed, 43 insertions(+), 53 deletions(-)

diff --git a/jshERP-web/src/views/bill/mixins/BillModalMixin.js b/jshERP-web/src/views/bill/mixins/BillModalMixin.js
index 32289848..abc065d3 100644
--- a/jshERP-web/src/views/bill/mixins/BillModalMixin.js
+++ b/jshERP-web/src/views/bill/mixins/BillModalMixin.js
@@ -185,63 +185,34 @@ export const BillModalMixin = {
             mpList: getMpListShort(Vue.ls.get('materialPropertyList')),  //扩展属性
             prefixNo: this.prefixNo
           }
-          if(value.indexOf(',')>-1) {
-            //多个条码
-            getMaterialByBarCode(param).then((res) => {
-                if (res && res.code === 200) {
-                  let mList = res.data
-                  let mArr = []
-                  for (let i = 0; i < mList.length; i++) {
-                    let mInfo = mList[i]
-                    let mObj = {
-                      depotId: mInfo.depotId,
-                      barCode: mInfo.mBarCode,
-                      name: mInfo.name,
-                      standard: mInfo.standard,
-                      model: mInfo.model,
-                      materialOther: mInfo.materialOther,
-                      stock: mInfo.stock,
-                      unit: mInfo.commodityUnit,
-                      sku: mInfo.sku,
-                      operNumber: 1,
-                      unitPrice: mInfo.billPrice,
-                      taxUnitPrice: mInfo.billPrice,
-                      allPrice: mInfo.billPrice,
-                      taxRate: 0,
-                      taxMoney: 0,
-                      taxLastMoney: mInfo.billPrice
-                    }
-                    mArr.push(mObj)
-                  }
-                  this.materialTable.dataSource = mArr
+          getMaterialByBarCode(param).then((res) => {
+            if (res && res.code === 200) {
+              let mList = res.data
+              if (value.indexOf(',') > -1) {
+                //多个条码
+                let mArr = this.materialTable.dataSource
+                for (let i = 0; i < mList.length; i++) {
+                  let mInfo = mList[i]
+                  let mObj = this.parseInfoToObj(mInfo)
+                  mObj.depotId = mInfo.depotId
+                  mObj.stock = mInfo.stock
+                  mArr.push(mObj)
                 }
-            });
-          } else {
-            //单个条码
-            getMaterialByBarCode(param).then((res) => {
-              if (res && res.code === 200) {
-                let mList = res.data
+                let taxLastMoneyTotal = 0
+                for (let j = 0; j < mArr.length; j++) {
+                  taxLastMoneyTotal += mArr[j].taxLastMoney
+                }
+                this.materialTable.dataSource = mArr
+                target.statisticsColumns.taxLastMoney = taxLastMoneyTotal
+                that.autoChangePrice(target)
+              } else {
+                //单个条码
                 let mArr = []
                 for (let i = 0; i < mList.length; i++) {
                   let mInfo = mList[i]
                   let mObj = {
                     rowKey: row.id,
-                    values: {
-                      barCode: mInfo.mBarCode,
-                      name: mInfo.name,
-                      standard: mInfo.standard,
-                      model: mInfo.model,
-                      materialOther: mInfo.materialOther,
-                      unit: mInfo.commodityUnit,
-                      sku: mInfo.sku,
-                      operNumber: 1,
-                      unitPrice: mInfo.billPrice,
-                      taxUnitPrice: mInfo.billPrice,
-                      allPrice: mInfo.billPrice,
-                      taxRate: 0,
-                      taxMoney: 0,
-                      taxLastMoney: mInfo.billPrice
-                    }
+                    values: this.parseInfoToObj(mInfo)
                   }
                   mArr.push(mObj)
                 }
@@ -250,8 +221,8 @@ export const BillModalMixin = {
                 target.recalcAllStatisticsColumns()
                 that.autoChangePrice(target)
               }
-            });
-          }
+            }
+          });
           break;
         case "operNumber":
           operNumber = value-0
@@ -315,6 +286,25 @@ export const BillModalMixin = {
           break;
       }
     },
+    //转为商品对象
+    parseInfoToObj(mInfo) {
+      return {
+        barCode: mInfo.mBarCode,
+        name: mInfo.name,
+        standard: mInfo.standard,
+        model: mInfo.model,
+        materialOther: mInfo.materialOther,
+        unit: mInfo.commodityUnit,
+        sku: mInfo.sku,
+        operNumber: 1,
+        unitPrice: mInfo.billPrice,
+        taxUnitPrice: mInfo.billPrice,
+        allPrice: mInfo.billPrice,
+        taxRate: 0,
+        taxMoney: 0,
+        taxLastMoney: mInfo.billPrice
+      }
+    },
     //删除一行或多行的时候触发
     onDeleted(ids, target) {
       target.recalcAllStatisticsColumns()