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

2021-08-06 01:24:28 +08:00
parent c6a5689f44
commit 5f6ab65681
16 changed files with 81 additions and 40 deletions
--- 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 },
--- 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 },
--- 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 },
--- 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 },
--- 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 },
--- 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 },
--- 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 },
--- 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 },
--- 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 },
--- 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 },
--- 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 },
--- 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 },
--- 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 },