purovps/jshERP
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
季圣华
2021-08-06 01:24:28 +08:00
parent c6a5689f44
commit 5f6ab65681
16 changed files with 81 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

71
jshERP-web/src/views/bill/mixins/BillModalMixin.js
View File

@@ -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([{
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,
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: res.data.billPrice,
taxUnitPrice: res.data.billPrice,
allPrice: res.data.billPrice,
unitPrice: mInfo.billPrice,
taxUnitPrice: mInfo.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

2
jshERP-web/src/views/bill/modules/AllocationOutModal.vue
View File

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

2
jshERP-web/src/views/bill/modules/AssembleModal.vue
View File

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

2
jshERP-web/src/views/bill/modules/DisassembleModal.vue
View File

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

2
jshERP-web/src/views/bill/modules/OtherInModal.vue
View File

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

2
jshERP-web/src/views/bill/modules/OtherOutModal.vue
View File

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

2
jshERP-web/src/views/bill/modules/PurchaseBackModal.vue
View File

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

2
jshERP-web/src/views/bill/modules/PurchaseInModal.vue
View File

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

2
jshERP-web/src/views/bill/modules/PurchaseOrderModal.vue
View File

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

2
jshERP-web/src/views/bill/modules/RetailBackModal.vue
View File

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

2
jshERP-web/src/views/bill/modules/RetailOutModal.vue
View File

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

2
jshERP-web/src/views/bill/modules/SaleBackModal.vue
View File

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

2
jshERP-web/src/views/bill/modules/SaleOrderModal.vue
View File

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

2
jshERP-web/src/views/bill/modules/SaleOutModal.vue
View File

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

2
jshERP-web/src/views/system/modules/SerialNumberBatchModal.vue
View File

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

2
jshERP-web/src/views/system/modules/SerialNumberModal.vue
View File

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