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

给商品和单据增加序列号和批次字段

Browse Source
This commit is contained in:
季圣华
2021-09-28 00:28:36 +08:00
parent 09b603c80e
commit 79c696b150
7 changed files with 107 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

94
jshERP-web/src/views/bill/dialog/BillDetail.vue
View File

@@ -884,12 +884,12 @@
//列定义
defColumns: [],
allocationOutColumns: [
{ title: '仓库名称', dataIndex: 'depotName', width: '8%'},
{ title: '条码', dataIndex: 'barCode', width: '10%'},
{ title: '仓库名称', dataIndex: 'depotName', width: '5%'},
{ title: '条码', dataIndex: 'barCode', width: '8%'},
{ title: '名称', dataIndex: 'name', width: '8%'},
{ title: '规格', dataIndex: 'standard', width: '5%'},
{ title: '型号', dataIndex: 'model', width: '5%'},
{ title: '扩展信息', dataIndex: 'materialOther', width: '6%'},
{ title: '扩展信息', dataIndex: 'materialOther', width: '5%'},
{ title: '库存', dataIndex: 'stock', width: '5%'},
{ title: '调入仓库', dataIndex: 'anotherDepotName', width: '8%'},
{ title: '单位', dataIndex: 'unit', width: '4%'},
@@ -901,12 +901,12 @@
],
assembleColumns: [
{ title: '商品类型', dataIndex: 'mType',width:'7%'},
{ title: '仓库名称', dataIndex: 'depotName', width: '8%'},
{ title: '条码', dataIndex: 'barCode', width: '10%'},
{ title: '仓库名称', dataIndex: 'depotName', width: '5%'},
{ title: '条码', dataIndex: 'barCode', width: '8%'},
{ title: '名称', dataIndex: 'name', width: '8%'},
{ title: '规格', dataIndex: 'standard', width: '5%'},
{ title: '型号', dataIndex: 'model', width: '5%'},
{ title: '扩展信息', dataIndex: 'materialOther', width: '6%'},
{ title: '扩展信息', dataIndex: 'materialOther', width: '5%'},
{ title: '库存', dataIndex: 'stock', width: '5%'},
{ title: '单位', dataIndex: 'unit', width: '4%'},
{ title: '多属性', dataIndex: 'sku', width: '4%'},
@@ -917,12 +917,12 @@
],
disassembleColumns: [
{ title: '商品类型', dataIndex: 'mType',width:'7%'},
{ title: '仓库名称', dataIndex: 'depotName', width: '8%'},
{ title: '条码', dataIndex: 'barCode', width: '10%'},
{ title: '仓库名称', dataIndex: 'depotName', width: '5%'},
{ title: '条码', dataIndex: 'barCode', width: '8%'},
{ title: '名称', dataIndex: 'name', width: '8%'},
{ title: '规格', dataIndex: 'standard', width: '5%'},
{ title: '型号', dataIndex: 'model', width: '5%'},
{ title: '扩展信息', dataIndex: 'materialOther', width: '6%'},
{ title: '扩展信息', dataIndex: 'materialOther', width: '5%'},
{ title: '库存', dataIndex: 'stock', width: '5%'},
{ title: '单位', dataIndex: 'unit', width: '4%'},
{ title: '多属性', dataIndex: 'sku', width: '4%'},
@@ -932,12 +932,12 @@
{ title: '备注', dataIndex: 'remark', width: '5%'}
],
otherInColumns: [
{ title: '仓库名称', dataIndex: 'depotName', width: '8%'},
{ title: '条码', dataIndex: 'barCode', width: '10%'},
{ title: '仓库名称', dataIndex: 'depotName', width: '5%'},
{ title: '条码', dataIndex: 'barCode', width: '8%'},
{ title: '名称', dataIndex: 'name', width: '8%'},
{ title: '规格', dataIndex: 'standard', width: '5%'},
{ title: '型号', dataIndex: 'model', width: '5%'},
{ title: '扩展信息', dataIndex: 'materialOther', width: '6%'},
{ title: '扩展信息', dataIndex: 'materialOther', width: '5%'},
{ title: '库存', dataIndex: 'stock', width: '5%'},
{ title: '单位', dataIndex: 'unit', width: '4%'},
{ title: '多属性', dataIndex: 'sku', width: '4%'},
@@ -947,12 +947,12 @@
{ title: '备注', dataIndex: 'remark', width: '5%'}
],
otherOutColumns: [
{ title: '仓库名称', dataIndex: 'depotName', width: '8%'},
{ title: '条码', dataIndex: 'barCode', width: '10%'},
{ title: '仓库名称', dataIndex: 'depotName', width: '5%'},
{ title: '条码', dataIndex: 'barCode', width: '8%'},
{ title: '名称', dataIndex: 'name', width: '8%'},
{ title: '规格', dataIndex: 'standard', width: '5%'},
{ title: '型号', dataIndex: 'model', width: '5%'},
{ title: '扩展信息', dataIndex: 'materialOther', width: '6%'},
{ title: '扩展信息', dataIndex: 'materialOther', width: '5%'},
{ title: '库存', dataIndex: 'stock', width: '5%'},
{ title: '单位', dataIndex: 'unit', width: '4%'},
{ title: '多属性', dataIndex: 'sku', width: '4%'},
@@ -962,49 +962,55 @@
{ title: '备注', dataIndex: 'remark', width: '5%'}
],
purchaseBackColumns: [
{ title: '仓库名称', dataIndex: 'depotName', width: '7%'},
{ title: '条码', dataIndex: 'barCode', width: '10%'},
{ title: '仓库名称', dataIndex: 'depotName', width: '5%'},
{ title: '条码', dataIndex: 'barCode', width: '8%'},
{ title: '名称', dataIndex: 'name', width: '8%'},
{ title: '规格', dataIndex: 'standard', width: '5%'},
{ title: '型号', dataIndex: 'model', width: '5%'},
{ title: '扩展信息', dataIndex: 'materialOther', width: '6%'},
{ title: '扩展信息', dataIndex: 'materialOther', width: '5%'},
{ title: '库存', dataIndex: 'stock', width: '5%'},
{ title: '单位', dataIndex: 'unit', width: '4%'},
{ title: '序列号', dataIndex: 'snList', width: '4%'},
{ title: '批号', dataIndex: 'batchNumber', width: '4%'},
{ title: '有效期', dataIndex: 'expirationDate',width: '6%'},
{ title: '多属性', dataIndex: 'sku', width: '4%'},
{ title: '数量', dataIndex: 'operNumber', width: '5%'},
{ title: '单价', dataIndex: 'unitPrice', width: '5%'},
{ title: '含税单价', dataIndex: 'taxUnitPrice', width: '5%'},
{ title: '金额', dataIndex: 'allPrice', width: '5%'},
{ title: '税率(%)', dataIndex: 'taxRate', width: '5%'},
{ title: '税额', dataIndex: 'taxMoney', width: '5%'},
{ title: '税额', dataIndex: 'taxMoney', width: '4%'},
{ title: '价税合计', dataIndex: 'taxLastMoney', width: '5%'},
{ title: '备注', dataIndex: 'remark', width: '5%'}
],
purchaseInColumns: [
{ title: '仓库名称', dataIndex: 'depotName', width: '7%'},
{ title: '条码', dataIndex: 'barCode', width: '10%'},
{ title: '仓库名称', dataIndex: 'depotName', width: '5%'},
{ title: '条码', dataIndex: 'barCode', width: '8%'},
{ title: '名称', dataIndex: 'name', width: '8%'},
{ title: '规格', dataIndex: 'standard', width: '5%'},
{ title: '型号', dataIndex: 'model', width: '5%'},
{ title: '扩展信息', dataIndex: 'materialOther', width: '6%'},
{ title: '扩展信息', dataIndex: 'materialOther', width: '5%'},
{ title: '库存', dataIndex: 'stock', width: '5%'},
{ title: '单位', dataIndex: 'unit', width: '4%'},
{ title: '序列号', dataIndex: 'snList', width: '4%'},
{ title: '批号', dataIndex: 'batchNumber', width: '4%'},
{ title: '有效期', dataIndex: 'expirationDate',width: '6%'},
{ title: '多属性', dataIndex: 'sku', width: '4%'},
{ title: '数量', dataIndex: 'operNumber', width: '5%'},
{ title: '单价', dataIndex: 'unitPrice', width: '5%'},
{ title: '含税单价', dataIndex: 'taxUnitPrice', width: '5%'},
{ title: '金额', dataIndex: 'allPrice', width: '5%'},
{ title: '税率(%)', dataIndex: 'taxRate', width: '5%'},
{ title: '税额', dataIndex: 'taxMoney', width: '5%'},
{ title: '税额', dataIndex: 'taxMoney', width: '4%'},
{ title: '价税合计', dataIndex: 'taxLastMoney', width: '5%'},
{ title: '备注', dataIndex: 'remark', width: '5%'}
],
purchaseOrderColumns: [
{ title: '条码', dataIndex: 'barCode', width: '10%'},
{ title: '条码', dataIndex: 'barCode', width: '8%'},
{ title: '名称', dataIndex: 'name', width: '8%'},
{ title: '规格', dataIndex: 'standard', width: '5%'},
{ title: '型号', dataIndex: 'model', width: '5%'},
{ title: '扩展信息', dataIndex: 'materialOther', width: '6%'},
{ title: '扩展信息', dataIndex: 'materialOther', width: '5%'},
{ title: '库存', dataIndex: 'stock', width: '5%'},
{ title: '单位', dataIndex: 'unit', width: '4%'},
{ title: '多属性', dataIndex: 'sku', width: '4%'},
@@ -1015,12 +1021,12 @@
{ title: '备注', dataIndex: 'remark', width: '5%'}
],
retailBackColumns: [
{ title: '仓库名称', dataIndex: 'depotName', width: '8%'},
{ title: '条码', dataIndex: 'barCode', width: '10%'},
{ title: '仓库名称', dataIndex: 'depotName', width: '5%'},
{ title: '条码', dataIndex: 'barCode', width: '8%'},
{ title: '名称', dataIndex: 'name', width: '8%'},
{ title: '规格', dataIndex: 'standard', width: '5%'},
{ title: '型号', dataIndex: 'model', width: '5%'},
{ title: '扩展信息', dataIndex: 'materialOther', width: '6%'},
{ title: '扩展信息', dataIndex: 'materialOther', width: '5%'},
{ title: '库存', dataIndex: 'stock', width: '5%'},
{ title: '单位', dataIndex: 'unit', width: '4%'},
{ title: '多属性', dataIndex: 'sku', width: '4%'},
@@ -1030,12 +1036,12 @@
{ title: '备注', dataIndex: 'remark', width: '5%'}
],
retailOutColumns: [
{ title: '仓库名称', dataIndex: 'depotName', width: '8%'},
{ title: '条码', dataIndex: 'barCode', width: '10%'},
{ title: '仓库名称', dataIndex: 'depotName', width: '5%'},
{ title: '条码', dataIndex: 'barCode', width: '8%'},
{ title: '名称', dataIndex: 'name', width: '8%'},
{ title: '规格', dataIndex: 'standard', width: '5%'},
{ title: '型号', dataIndex: 'model', width: '5%'},
{ title: '扩展信息', dataIndex: 'materialOther', width: '6%'},
{ title: '扩展信息', dataIndex: 'materialOther', width: '5%'},
{ title: '库存', dataIndex: 'stock', width: '5%'},
{ title: '单位', dataIndex: 'unit', width: '4%'},
{ title: '多属性', dataIndex: 'sku', width: '4%'},
@@ -1045,30 +1051,33 @@
{ title: '备注', dataIndex: 'remark', width: '5%'}
],
saleBackColumns: [
{ title: '仓库名称', dataIndex: 'depotName', width: '7%'},
{ title: '条码', dataIndex: 'barCode', width: '10%'},
{ title: '仓库名称', dataIndex: 'depotName', width: '5%'},
{ title: '条码', dataIndex: 'barCode', width: '8%'},
{ title: '名称', dataIndex: 'name', width: '8%'},
{ title: '规格', dataIndex: 'standard', width: '5%'},
{ title: '型号', dataIndex: 'model', width: '5%'},
{ title: '扩展信息', dataIndex: 'materialOther', width: '6%'},
{ title: '扩展信息', dataIndex: 'materialOther', width: '5%'},
{ title: '库存', dataIndex: 'stock', width: '5%'},
{ title: '单位', dataIndex: 'unit', width: '4%'},
{ title: '序列号', dataIndex: 'snList', width: '4%'},
{ title: '批号', dataIndex: 'batchNumber', width: '4%'},
{ title: '有效期', dataIndex: 'expirationDate',width: '6%'},
{ title: '多属性', dataIndex: 'sku', width: '4%'},
{ title: '数量', dataIndex: 'operNumber', width: '5%'},
{ title: '单价', dataIndex: 'unitPrice', width: '5%'},
{ title: '含税单价', dataIndex: 'taxUnitPrice', width: '5%'},
{ title: '金额', dataIndex: 'allPrice', width: '5%'},
{ title: '税率(%)', dataIndex: 'taxRate', width: '5%'},
{ title: '税额', dataIndex: 'taxMoney', width: '5%'},
{ title: '税额', dataIndex: 'taxMoney', width: '4%'},
{ title: '价税合计', dataIndex: 'taxLastMoney', width: '5%'},
{ title: '备注', dataIndex: 'remark', width: '5%'}
],
saleOrderColumns: [
{ title: '条码', dataIndex: 'barCode', width: '10%'},
{ title: '条码', dataIndex: 'barCode', width: '8%'},
{ title: '名称', dataIndex: 'name', width: '8%'},
{ title: '规格', dataIndex: 'standard', width: '5%'},
{ title: '型号', dataIndex: 'model', width: '5%'},
{ title: '扩展信息', dataIndex: 'materialOther', width: '6%'},
{ title: '扩展信息', dataIndex: 'materialOther', width: '5%'},
{ title: '库存', dataIndex: 'stock', width: '5%'},
{ title: '单位', dataIndex: 'unit', width: '4%'},
{ title: '多属性', dataIndex: 'sku', width: '4%'},
@@ -1079,21 +1088,24 @@
{ title: '备注', dataIndex: 'remark', width: '5%'}
],
saleOutColumns: [
{ title: '仓库名称', dataIndex: 'depotName', width: '7%'},
{ title: '条码', dataIndex: 'barCode', width: '10%'},
{ title: '仓库名称', dataIndex: 'depotName', width: '5%'},
{ title: '条码', dataIndex: 'barCode', width: '8%'},
{ title: '名称', dataIndex: 'name', width: '8%'},
{ title: '规格', dataIndex: 'standard', width: '5%'},
{ title: '型号', dataIndex: 'model', width: '5%'},
{ title: '扩展信息', dataIndex: 'materialOther', width: '6%'},
{ title: '扩展信息', dataIndex: 'materialOther', width: '5%'},
{ title: '库存', dataIndex: 'stock', width: '5%'},
{ title: '单位', dataIndex: 'unit', width: '4%'},
{ title: '序列号', dataIndex: 'snList', width: '4%'},
{ title: '批号', dataIndex: 'batchNumber', width: '4%'},
{ title: '有效期', dataIndex: 'expirationDate',width: '6%'},
{ title: '多属性', dataIndex: 'sku', width: '4%'},
{ title: '数量', dataIndex: 'operNumber', width: '5%'},
{ title: '单价', dataIndex: 'unitPrice', width: '5%'},
{ title: '含税单价', dataIndex: 'taxUnitPrice', width: '5%'},
{ title: '金额', dataIndex: 'allPrice', width: '5%'},
{ title: '税率(%)', dataIndex: 'taxRate', width: '5%'},
{ title: '税额', dataIndex: 'taxMoney', width: '5%'},
{ title: '税额', dataIndex: 'taxMoney', width: '4%'},
{ title: '价税合计', dataIndex: 'taxLastMoney', width: '5%'},
{ title: '备注', dataIndex: 'remark', width: '5%'}
]