优化商品条码查询接口，支持选择多商品

jshERP-web/src/views/bill/mixins/BillModalMixin.js

@@ -185,32 +185,73 @@ 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) {
-              target.setValues([{
+                  let mList = res.data
-                rowKey: row.id,
+                  let mArr = []
-                values: {
+                  for (let i = 0; i < mList.length; i++) {
-                  barCode: res.data.mBarCode,
+                    let mInfo = mList[i]
-                  name: res.data.name,
+                    let mObj = {
-                  standard: res.data.standard,
+                      depotId: mInfo.depotId,
-                  model: res.data.model,
+                      barCode: mInfo.mBarCode,
-                  materialOther: res.data.materialOther,
+                      name: mInfo.name,
-                  unit: res.data.commodityUnit,
+                      standard: mInfo.standard,
-                  sku: res.data.sku,
+                      model: mInfo.model,
+                      materialOther: mInfo.materialOther,
+                      stock: mInfo.stock,
+                      unit: mInfo.commodityUnit,
+                      sku: mInfo.sku,
                       operNumber: 1,
-                  unitPrice: res.data.billPrice,
+                      unitPrice: mInfo.billPrice,
-                  taxUnitPrice: res.data.billPrice,
+                      taxUnitPrice: mInfo.billPrice,
-                  allPrice: res.data.billPrice,
+                      allPrice: mInfo.billPrice,
                       taxRate: 0,
                       taxMoney: 0,
-                  taxLastMoney: res.data.billPrice,
+                      taxLastMoney: mInfo.billPrice
                     }
-              }]);
+                    mArr.push(mObj)
+                  }
+                  this.materialTable.dataSource = mArr
+                }
+            });
+          } 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

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 },

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 },

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 },

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 },

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 },

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 },

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 },

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 },

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 },

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 },

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 },

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 },

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 },

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})
           }
         })
       }

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})
           }
         })
       }