From 5f6ab65681cd918f73a7a9b00b290756356a003e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=A3=E5=9C=A3=E5=8D=8E?= <752718920@qq.com>
Date: Fri, 6 Aug 2021 01:24:28 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=95=86=E5=93=81=E6=9D=A1?=
 =?UTF-8?q?=E7=A0=81=E6=9F=A5=E8=AF=A2=E6=8E=A5=E5=8F=A3=EF=BC=8C=E6=94=AF?=
 =?UTF-8?q?=E6=8C=81=E9=80=89=E6=8B=A9=E5=A4=9A=E5=95=86=E5=93=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/bill/mixins/BillModalMixin.js   | 91 ++++++++++++++-----
 .../views/bill/modules/AllocationOutModal.vue |  2 +-
 .../src/views/bill/modules/AssembleModal.vue  |  2 +-
 .../views/bill/modules/DisassembleModal.vue   |  2 +-
 .../src/views/bill/modules/OtherInModal.vue   |  2 +-
 .../src/views/bill/modules/OtherOutModal.vue  |  2 +-
 .../views/bill/modules/PurchaseBackModal.vue  |  2 +-
 .../views/bill/modules/PurchaseInModal.vue    |  2 +-
 .../views/bill/modules/PurchaseOrderModal.vue |  2 +-
 .../views/bill/modules/RetailBackModal.vue    |  2 +-
 .../src/views/bill/modules/RetailOutModal.vue |  2 +-
 .../src/views/bill/modules/SaleBackModal.vue  |  2 +-
 .../src/views/bill/modules/SaleOrderModal.vue |  2 +-
 .../src/views/bill/modules/SaleOutModal.vue   |  2 +-
 .../system/modules/SerialNumberBatchModal.vue |  2 +-
 .../system/modules/SerialNumberModal.vue      |  2 +-
 16 files changed, 81 insertions(+), 40 deletions(-)

diff --git a/jshERP-web/src/views/bill/mixins/BillModalMixin.js b/jshERP-web/src/views/bill/mixins/BillModalMixin.js
index 48a9a927..32289848 100644
--- a/jshERP-web/src/views/bill/mixins/BillModalMixin.js
+++ b/jshERP-web/src/views/bill/mixins/BillModalMixin.js
@@ -185,32 +185,73 @@ export const BillModalMixin = {
             mpList: getMpListShort(Vue.ls.get('materialPropertyList')),  //扩展属性
             prefixNo: this.prefixNo
           }
-          getMaterialByBarCode(param).then((res) => {
-            if (res && res.code === 200) {
-              target.setValues([{
-                rowKey: row.id,
-                values: {
-                  barCode: res.data.mBarCode,
-                  name: res.data.name,
-                  standard: res.data.standard,
-                  model: res.data.model,
-                  materialOther: res.data.materialOther,
-                  unit: res.data.commodityUnit,
-                  sku: res.data.sku,
-                  operNumber: 1,
-                  unitPrice: res.data.billPrice,
-                  taxUnitPrice: res.data.billPrice,
-                  allPrice: res.data.billPrice,
-                  taxRate: 0,
-                  taxMoney: 0,
-                  taxLastMoney: res.data.billPrice,
+          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
                 }
-              }]);
-              that.getStockByDepotBarCode(row, target)
-              target.recalcAllStatisticsColumns()
-              that.autoChangePrice(target)
-            }
-          });
+            });
+          } else {
+            //单个条码
+            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 = {
+                    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
+                    }
+                  }
+                  mArr.push(mObj)
+                }
+                target.setValues(mArr);
+                that.getStockByDepotBarCode(row, target)
+                target.recalcAllStatisticsColumns()
+                that.autoChangePrice(target)
+              }
+            });
+          }
           break;
         case "operNumber":
           operNumber = value-0
diff --git a/jshERP-web/src/views/bill/modules/AllocationOutModal.vue b/jshERP-web/src/views/bill/modules/AllocationOutModal.vue
index 7b6bd187..40d42543 100644
--- a/jshERP-web/src/views/bill/modules/AllocationOutModal.vue
+++ b/jshERP-web/src/views/bill/modules/AllocationOutModal.vue
@@ -103,7 +103,7 @@
             { title: '仓库名称', key: 'depotId', width: '7%', type: FormTypes.select, placeholder: '请选择${title}', options: [],
               allowSearch:true, validateRules: [{ required: true, message: '${title}不能为空' }]
             },
-            { title: '条码', key: 'barCode', width: '8%', type: FormTypes.popupJsh, multi: false,
+            { title: '条码', key: 'barCode', width: '8%', type: FormTypes.popupJsh, multi: true,
               validateRules: [{ required: true, message: '${title}不能为空' }]
             },
             { title: '名称', key: 'name', width: '6%', type: FormTypes.input, readonly: true },
diff --git a/jshERP-web/src/views/bill/modules/AssembleModal.vue b/jshERP-web/src/views/bill/modules/AssembleModal.vue
index e686f3a8..425e3941 100644
--- a/jshERP-web/src/views/bill/modules/AssembleModal.vue
+++ b/jshERP-web/src/views/bill/modules/AssembleModal.vue
@@ -105,7 +105,7 @@
             { title: '仓库名称', key: 'depotId', width: '7%', type: FormTypes.select, placeholder: '请选择${title}', options: [],
               allowSearch:true, validateRules: [{ required: true, message: '${title}不能为空' }]
             },
-            { title: '条码', key: 'barCode', width: '8%', type: FormTypes.popupJsh, multi: false,
+            { title: '条码', key: 'barCode', width: '8%', type: FormTypes.popupJsh, multi: true,
               validateRules: [{ required: true, message: '${title}不能为空' }]
             },
             { title: '名称', key: 'name', width: '6%', type: FormTypes.input, readonly: true },
diff --git a/jshERP-web/src/views/bill/modules/DisassembleModal.vue b/jshERP-web/src/views/bill/modules/DisassembleModal.vue
index be0a8741..61f863c0 100644
--- a/jshERP-web/src/views/bill/modules/DisassembleModal.vue
+++ b/jshERP-web/src/views/bill/modules/DisassembleModal.vue
@@ -105,7 +105,7 @@
             { title: '仓库名称', key: 'depotId', width: '7%', type: FormTypes.select, placeholder: '请选择${title}', options: [],
               allowSearch:true, validateRules: [{ required: true, message: '${title}不能为空' }]
             },
-            { title: '条码', key: 'barCode', width: '8%', type: FormTypes.popupJsh, multi: false,
+            { title: '条码', key: 'barCode', width: '8%', type: FormTypes.popupJsh, multi: true,
               validateRules: [{ required: true, message: '${title}不能为空' }]
             },
             { title: '名称', key: 'name', width: '6%', type: FormTypes.input, readonly: true },
diff --git a/jshERP-web/src/views/bill/modules/OtherInModal.vue b/jshERP-web/src/views/bill/modules/OtherInModal.vue
index f9071bfa..74f65d68 100644
--- a/jshERP-web/src/views/bill/modules/OtherInModal.vue
+++ b/jshERP-web/src/views/bill/modules/OtherInModal.vue
@@ -112,7 +112,7 @@
             { title: '仓库名称', key: 'depotId', width: '7%', type: FormTypes.select, placeholder: '请选择${title}', options: [],
               allowSearch:true, validateRules: [{ required: true, message: '${title}不能为空' }]
             },
-            { title: '条码', key: 'barCode', width: '8%', type: FormTypes.popupJsh, multi: false,
+            { title: '条码', key: 'barCode', width: '8%', type: FormTypes.popupJsh, multi: true,
               validateRules: [{ required: true, message: '${title}不能为空' }]
             },
             { title: '名称', key: 'name', width: '6%', type: FormTypes.input, readonly: true },
diff --git a/jshERP-web/src/views/bill/modules/OtherOutModal.vue b/jshERP-web/src/views/bill/modules/OtherOutModal.vue
index d62349c8..fe99ae24 100644
--- a/jshERP-web/src/views/bill/modules/OtherOutModal.vue
+++ b/jshERP-web/src/views/bill/modules/OtherOutModal.vue
@@ -112,7 +112,7 @@
             { title: '仓库名称', key: 'depotId', width: '7%', type: FormTypes.select, placeholder: '请选择${title}', options: [],
               allowSearch:true, validateRules: [{ required: true, message: '${title}不能为空' }]
             },
-            { title: '条码', key: 'barCode', width: '8%', type: FormTypes.popupJsh, multi: false,
+            { title: '条码', key: 'barCode', width: '8%', type: FormTypes.popupJsh, multi: true,
               validateRules: [{ required: true, message: '${title}不能为空' }]
             },
             { title: '名称', key: 'name', width: '6%', type: FormTypes.input, readonly: true },
diff --git a/jshERP-web/src/views/bill/modules/PurchaseBackModal.vue b/jshERP-web/src/views/bill/modules/PurchaseBackModal.vue
index f699bd0b..252cd475 100644
--- a/jshERP-web/src/views/bill/modules/PurchaseBackModal.vue
+++ b/jshERP-web/src/views/bill/modules/PurchaseBackModal.vue
@@ -174,7 +174,7 @@
             { title: '仓库名称', key: 'depotId', width: '7%', type: FormTypes.select, placeholder: '请选择${title}', options: [],
               allowSearch:true, validateRules: [{ required: true, message: '${title}不能为空' }]
             },
-            { title: '条码', key: 'barCode', width: '8%', type: FormTypes.popupJsh, multi: false,
+            { title: '条码', key: 'barCode', width: '8%', type: FormTypes.popupJsh, multi: true,
               validateRules: [{ required: true, message: '${title}不能为空' }]
             },
             { title: '名称', key: 'name', width: '6%', type: FormTypes.input, readonly: true },
diff --git a/jshERP-web/src/views/bill/modules/PurchaseInModal.vue b/jshERP-web/src/views/bill/modules/PurchaseInModal.vue
index 265bdf84..0868e1a9 100644
--- a/jshERP-web/src/views/bill/modules/PurchaseInModal.vue
+++ b/jshERP-web/src/views/bill/modules/PurchaseInModal.vue
@@ -175,7 +175,7 @@
             { title: '仓库名称', key: 'depotId', width: '7%', type: FormTypes.select, placeholder: '请选择${title}', options: [],
               allowSearch:true, validateRules: [{ required: true, message: '${title}不能为空' }]
             },
-            { title: '条码', key: 'barCode', width: '8%', type: FormTypes.popupJsh, multi: false,
+            { title: '条码', key: 'barCode', width: '8%', type: FormTypes.popupJsh, multi: true,
               validateRules: [{ required: true, message: '${title}不能为空' }]
             },
             { title: '名称', key: 'name', width: '6%', type: FormTypes.input, readonly: true },
diff --git a/jshERP-web/src/views/bill/modules/PurchaseOrderModal.vue b/jshERP-web/src/views/bill/modules/PurchaseOrderModal.vue
index 88d9a236..d0323cfc 100644
--- a/jshERP-web/src/views/bill/modules/PurchaseOrderModal.vue
+++ b/jshERP-web/src/views/bill/modules/PurchaseOrderModal.vue
@@ -115,7 +115,7 @@
             { title: '仓库名称', key: 'depotId', width: '7%', type: FormTypes.select, placeholder: '请选择${title}', options: [],
               allowSearch:true, validateRules: [{ required: true, message: '${title}不能为空' }]
             },
-            { title: '条码', key: 'barCode', width: '8%', type: FormTypes.popupJsh, multi: false,
+            { title: '条码', key: 'barCode', width: '8%', type: FormTypes.popupJsh, multi: true,
               validateRules: [{ required: true, message: '${title}不能为空' }]
             },
             { title: '名称', key: 'name', width: '6%', type: FormTypes.input, readonly: true },
diff --git a/jshERP-web/src/views/bill/modules/RetailBackModal.vue b/jshERP-web/src/views/bill/modules/RetailBackModal.vue
index 5ce737ae..344fe720 100644
--- a/jshERP-web/src/views/bill/modules/RetailBackModal.vue
+++ b/jshERP-web/src/views/bill/modules/RetailBackModal.vue
@@ -156,7 +156,7 @@
             { title: '仓库名称', key: 'depotId', width: '7%', type: FormTypes.select, placeholder: '请选择${title}', options: [],
               allowSearch:true, validateRules: [{ required: true, message: '${title}不能为空' }]
             },
-            { title: '条码', key: 'barCode', width: '12%', type: FormTypes.popupJsh, multi: false,
+            { title: '条码', key: 'barCode', width: '12%', type: FormTypes.popupJsh, multi: true,
               validateRules: [{ required: true, message: '${title}不能为空' }]
             },
             { title: '名称', key: 'name', width: '8%', type: FormTypes.input, readonly: true },
diff --git a/jshERP-web/src/views/bill/modules/RetailOutModal.vue b/jshERP-web/src/views/bill/modules/RetailOutModal.vue
index 0683ed12..82d2dfa7 100644
--- a/jshERP-web/src/views/bill/modules/RetailOutModal.vue
+++ b/jshERP-web/src/views/bill/modules/RetailOutModal.vue
@@ -156,7 +156,7 @@
             { title: '仓库名称', key: 'depotId', width: '7%', type: FormTypes.select, placeholder: '请选择${title}', options: [],
               allowSearch:true, validateRules: [{ required: true, message: '${title}不能为空' }]
             },
-            { title: '条码', key: 'barCode', width: '12%', type: FormTypes.popupJsh, multi: false,
+            { title: '条码', key: 'barCode', width: '12%', type: FormTypes.popupJsh, multi: true,
               validateRules: [{ required: true, message: '${title}不能为空' }]
             },
             { title: '名称', key: 'name', width: '8%', type: FormTypes.input, readonly: true },
diff --git a/jshERP-web/src/views/bill/modules/SaleBackModal.vue b/jshERP-web/src/views/bill/modules/SaleBackModal.vue
index 01ede890..7fbe654f 100644
--- a/jshERP-web/src/views/bill/modules/SaleBackModal.vue
+++ b/jshERP-web/src/views/bill/modules/SaleBackModal.vue
@@ -179,7 +179,7 @@
             { title: '仓库名称', key: 'depotId', width: '7%', type: FormTypes.select, placeholder: '请选择${title}', options: [],
               allowSearch:true, validateRules: [{ required: true, message: '${title}不能为空' }]
             },
-            { title: '条码', key: 'barCode', width: '8%', type: FormTypes.popupJsh, multi: false,
+            { title: '条码', key: 'barCode', width: '8%', type: FormTypes.popupJsh, multi: true,
               validateRules: [{ required: true, message: '${title}不能为空' }]
             },
             { title: '名称', key: 'name', width: '6%', type: FormTypes.input, readonly: true },
diff --git a/jshERP-web/src/views/bill/modules/SaleOrderModal.vue b/jshERP-web/src/views/bill/modules/SaleOrderModal.vue
index 65999992..79d117fd 100644
--- a/jshERP-web/src/views/bill/modules/SaleOrderModal.vue
+++ b/jshERP-web/src/views/bill/modules/SaleOrderModal.vue
@@ -118,7 +118,7 @@
             { title: '仓库名称', key: 'depotId', width: '7%', type: FormTypes.select, placeholder: '请选择${title}', options: [],
               allowSearch:true, validateRules: [{ required: true, message: '${title}不能为空' }]
             },
-            { title: '条码', key: 'barCode', width: '8%', type: FormTypes.popupJsh, multi: false,
+            { title: '条码', key: 'barCode', width: '8%', type: FormTypes.popupJsh, multi: true,
               validateRules: [{ required: true, message: '${title}不能为空' }]
             },
             { title: '名称', key: 'name', width: '6%', type: FormTypes.input, readonly: true },
diff --git a/jshERP-web/src/views/bill/modules/SaleOutModal.vue b/jshERP-web/src/views/bill/modules/SaleOutModal.vue
index c13bcf3d..4ceccc24 100644
--- a/jshERP-web/src/views/bill/modules/SaleOutModal.vue
+++ b/jshERP-web/src/views/bill/modules/SaleOutModal.vue
@@ -179,7 +179,7 @@
             { title: '仓库名称', key: 'depotId', width: '7%', type: FormTypes.select, placeholder: '请选择${title}', options: [],
               allowSearch:true, validateRules: [{ required: true, message: '${title}不能为空' }]
             },
-            { title: '条码', key: 'barCode', width: '8%', type: FormTypes.popupJsh, multi: false,
+            { title: '条码', key: 'barCode', width: '8%', type: FormTypes.popupJsh, multi: true,
               validateRules: [{ required: true, message: '${title}不能为空' }]
             },
             { title: '名称', key: 'name', width: '6%', type: FormTypes.input, readonly: true },
diff --git a/jshERP-web/src/views/system/modules/SerialNumberBatchModal.vue b/jshERP-web/src/views/system/modules/SerialNumberBatchModal.vue
index d570ce4c..67a0ecfb 100644
--- a/jshERP-web/src/views/system/modules/SerialNumberBatchModal.vue
+++ b/jshERP-web/src/views/system/modules/SerialNumberBatchModal.vue
@@ -124,7 +124,7 @@
         }
         getMaterialByBarCode(param).then((res) => {
           if (res && res.code === 200) {
-            this.form.setFieldsValue({'materialName': res.data.name})
+            this.form.setFieldsValue({'materialName': res.data[0].name})
           }
         })
       }
diff --git a/jshERP-web/src/views/system/modules/SerialNumberModal.vue b/jshERP-web/src/views/system/modules/SerialNumberModal.vue
index 52903d3a..e566c1df 100644
--- a/jshERP-web/src/views/system/modules/SerialNumberModal.vue
+++ b/jshERP-web/src/views/system/modules/SerialNumberModal.vue
@@ -144,7 +144,7 @@
         }
         getMaterialByBarCode(param).then((res) => {
           if (res && res.code === 200) {
-            this.form.setFieldsValue({'materialName': res.data.name})
+            this.form.setFieldsValue({'materialName': res.data[0].name})
           }
         })
       }