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

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

@@ -181,6 +181,9 @@
{ title: '扩展信息', key: 'materialOther', width: '5%', type: FormTypes.input, readonly: true }, { title: '扩展信息', key: 'materialOther', width: '5%', type: FormTypes.input, readonly: true },
{ title: '库存', key: 'stock', width: '5%', type: FormTypes.input, readonly: true }, { title: '库存', key: 'stock', width: '5%', type: FormTypes.input, readonly: true },
{ title: '单位', key: 'unit', width: '4%', type: FormTypes.input, readonly: true }, { title: '单位', key: 'unit', width: '4%', type: FormTypes.input, readonly: true },
{ title: '序列号', key: 'snList', width: '5%', type: FormTypes.input },
{ title: '批号', key: 'batchNumber', width: '5%', type: FormTypes.input },
{ title: '有效期', key: 'expirationDate',width: '7%', type: FormTypes.input },
{ title: '多属性', key: 'sku', width: '4%', type: FormTypes.input, readonly: true }, { title: '多属性', key: 'sku', width: '4%', type: FormTypes.input, readonly: true },
{ title: '数量', key: 'operNumber', width: '5%', type: FormTypes.inputNumber, statistics: true, { title: '数量', key: 'operNumber', width: '5%', type: FormTypes.inputNumber, statistics: true,
validateRules: [{ required: true, message: '${title}不能为空' }] validateRules: [{ required: true, message: '${title}不能为空' }]

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

@@ -182,6 +182,9 @@
{ title: '扩展信息', key: 'materialOther', width: '5%', type: FormTypes.input, readonly: true }, { title: '扩展信息', key: 'materialOther', width: '5%', type: FormTypes.input, readonly: true },
{ title: '库存', key: 'stock', width: '5%', type: FormTypes.input, readonly: true }, { title: '库存', key: 'stock', width: '5%', type: FormTypes.input, readonly: true },
{ title: '单位', key: 'unit', width: '4%', type: FormTypes.input, readonly: true }, { title: '单位', key: 'unit', width: '4%', type: FormTypes.input, readonly: true },
{ title: '序列号', key: 'snList', width: '5%', type: FormTypes.input },
{ title: '批号', key: 'batchNumber', width: '5%', type: FormTypes.input },
{ title: '有效期', key: 'expirationDate',width: '7%', type: FormTypes.date },
{ title: '多属性', key: 'sku', width: '4%', type: FormTypes.input, readonly: true }, { title: '多属性', key: 'sku', width: '4%', type: FormTypes.input, readonly: true },
{ title: '原数量', key: 'preNumber', width: '4%', type: FormTypes.input, readonly: true }, { title: '原数量', key: 'preNumber', width: '4%', type: FormTypes.input, readonly: true },
{ title: '已入库', key: 'finishNumber', width: '4%', type: FormTypes.input, readonly: true }, { title: '已入库', key: 'finishNumber', width: '4%', type: FormTypes.input, readonly: true },

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

@@ -186,6 +186,9 @@
{ title: '扩展信息', key: 'materialOther', width: '5%', type: FormTypes.input, readonly: true }, { title: '扩展信息', key: 'materialOther', width: '5%', type: FormTypes.input, readonly: true },
{ title: '库存', key: 'stock', width: '5%', type: FormTypes.input, readonly: true }, { title: '库存', key: 'stock', width: '5%', type: FormTypes.input, readonly: true },
{ title: '单位', key: 'unit', width: '4%', type: FormTypes.input, readonly: true }, { title: '单位', key: 'unit', width: '4%', type: FormTypes.input, readonly: true },
{ title: '序列号', key: 'snList', width: '5%', type: FormTypes.input },
{ title: '批号', key: 'batchNumber', width: '5%', type: FormTypes.input },
{ title: '有效期', key: 'expirationDate',width: '7%', type: FormTypes.input },
{ title: '多属性', key: 'sku', width: '4%', type: FormTypes.input, readonly: true }, { title: '多属性', key: 'sku', width: '4%', type: FormTypes.input, readonly: true },
{ title: '数量', key: 'operNumber', width: '5%', type: FormTypes.inputNumber, statistics: true, { title: '数量', key: 'operNumber', width: '5%', type: FormTypes.inputNumber, statistics: true,
validateRules: [{ required: true, message: '${title}不能为空' }] validateRules: [{ required: true, message: '${title}不能为空' }]

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

@@ -186,6 +186,9 @@
{ title: '扩展信息', key: 'materialOther', width: '5%', type: FormTypes.input, readonly: true }, { title: '扩展信息', key: 'materialOther', width: '5%', type: FormTypes.input, readonly: true },
{ title: '库存', key: 'stock', width: '5%', type: FormTypes.input, readonly: true }, { title: '库存', key: 'stock', width: '5%', type: FormTypes.input, readonly: true },
{ title: '单位', key: 'unit', width: '4%', type: FormTypes.input, readonly: true }, { title: '单位', key: 'unit', width: '4%', type: FormTypes.input, readonly: true },
{ title: '序列号', key: 'snList', width: '5%', type: FormTypes.input },
{ title: '批号', key: 'batchNumber', width: '5%', type: FormTypes.input },
{ title: '有效期', key: 'expirationDate',width: '7%', type: FormTypes.input },
{ title: '多属性', key: 'sku', width: '4%', type: FormTypes.input, readonly: true }, { title: '多属性', key: 'sku', width: '4%', type: FormTypes.input, readonly: true },
{ title: '原数量', key: 'preNumber', width: '4%', type: FormTypes.input, readonly: true }, { title: '原数量', key: 'preNumber', width: '4%', type: FormTypes.input, readonly: true },
{ title: '已入库', key: 'finishNumber', width: '4%', type: FormTypes.input, readonly: true }, { title: '已入库', key: 'finishNumber', width: '4%', type: FormTypes.input, readonly: true },

9
jshERP-web/src/views/material/MaterialList.vue
View File

@@ -106,6 +106,10 @@
<a-tag v-if="enableSerialNumber==1" color="green">有</a-tag> <a-tag v-if="enableSerialNumber==1" color="green">有</a-tag>
<a-tag v-if="enableSerialNumber==0" color="orange">无</a-tag> <a-tag v-if="enableSerialNumber==0" color="orange">无</a-tag>
</template> </template>
<template slot="customRenderEnableBatchNumber" slot-scope="enableBatchNumber">
<a-tag v-if="enableBatchNumber==1" color="green">有</a-tag>
<a-tag v-if="enableBatchNumber==0" color="orange">无</a-tag>
</template>
</a-table> </a-table>
</div> </div>
<!-- table区域-end --> <!-- table区域-end -->
@@ -175,11 +179,14 @@
{title: '序列号', dataIndex: 'enableSerialNumber', width: '4%', align: "center", {title: '序列号', dataIndex: 'enableSerialNumber', width: '4%', align: "center",
scopedSlots: { customRender: 'customRenderEnableSerialNumber' } scopedSlots: { customRender: 'customRenderEnableSerialNumber' }
}, },
{title: '批号', dataIndex: 'enableBatchNumber', width: '3%', align: "center",
scopedSlots: { customRender: 'customRenderEnableBatchNumber' }
},
{ {
title: '操作', title: '操作',
dataIndex: 'action', dataIndex: 'action',
align:"center", align:"center",
width: '8%', width: '6%',
scopedSlots: { customRender: 'action' }, scopedSlots: { customRender: 'action' },
} }
], ],

55
jshERP-web/src/views/material/modules/MaterialModal.vue
View File

@@ -1,7 +1,7 @@
<template> <template>
<a-modal <a-modal
:title="title" :title="title"
:width="1200" :width="1300"
:visible="visible" :visible="visible"
:confirmLoading="confirmLoading" :confirmLoading="confirmLoading"
@ok="handleOk" @ok="handleOk"
@@ -19,17 +19,22 @@
<a-tabs default-active-key="1"> <a-tabs default-active-key="1">
<a-tab-pane key="1" tab="基本信息" forceRender> <a-tab-pane key="1" tab="基本信息" forceRender>
<a-row class="form-row" :gutter="24"> <a-row class="form-row" :gutter="24">
<a-col :lg="8" :md="12" :sm="24"> <a-col :md="6" :sm="24">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="名称"> <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="名称">
<a-input placeholder="请输入名称" v-decorator.trim="[ 'name', validatorRules.name]" /> <a-input placeholder="请输入名称" v-decorator.trim="[ 'name', validatorRules.name]" />
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :lg="8" :md="12" :sm="24"> <a-col :md="6" :sm="24">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="规格"> <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="规格">
<a-input placeholder="请输入规格" v-decorator.trim="[ 'standard' ]" /> <a-input placeholder="请输入规格" v-decorator.trim="[ 'standard' ]" />
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :lg="8" :md="12" :sm="24"> <a-col :md="6" :sm="24">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="型号">
<a-input placeholder="请输入型号" v-decorator.trim="[ 'model' ]" />
</a-form-item>
</a-col>
<a-col :md="6" :sm="24">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="单位"> <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="单位">
<a-row class="form-row" :gutter="24"> <a-row class="form-row" :gutter="24">
<a-col :lg="13" :md="13" :sm="24"> <a-col :lg="13" :md="13" :sm="24">
@@ -48,24 +53,19 @@
</a-row> </a-row>
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :lg="8" :md="12" :sm="24"> <a-col :md="6" :sm="24">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="型号">
<a-input placeholder="请输入型号" v-decorator.trim="[ 'model' ]" />
</a-form-item>
</a-col>
<a-col :lg="8" :md="12" :sm="24">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="颜色"> <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="颜色">
<a-input placeholder="请输入颜色" v-decorator.trim="[ 'color' ]" /> <a-input placeholder="请输入颜色" v-decorator.trim="[ 'color' ]" />
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :lg="8" :md="12" :sm="24"> <a-col :md="6" :sm="24">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="类别"> <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="类别">
<a-tree-select style="width:100%" :dropdownStyle="{maxHeight:'200px',overflow:'auto'}" allow-clear <a-tree-select style="width:100%" :dropdownStyle="{maxHeight:'200px',overflow:'auto'}" allow-clear
:treeData="categoryTree" v-decorator="[ 'categoryId' ]" placeholder="请选择类别"> :treeData="categoryTree" v-decorator="[ 'categoryId' ]" placeholder="请选择类别">
</a-tree-select> </a-tree-select>
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :lg="8" :md="12" :sm="24"> <a-col :md="6" :sm="24">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="序列号"> <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="序列号">
<a-select placeholder="有无序列号" v-decorator="[ 'enableSerialNumber' ]"> <a-select placeholder="有无序列号" v-decorator="[ 'enableSerialNumber' ]">
<a-select-option value="1">有</a-select-option> <a-select-option value="1">有</a-select-option>
@@ -73,12 +73,25 @@
</a-select> </a-select>
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :lg="8" :md="12" :sm="24"> <a-col :md="6" :sm="24">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="批号">
<a-select placeholder="有无批号" v-decorator="[ 'enableBatchNumber' ]">
<a-select-option value="1">有</a-select-option>
<a-select-option value="0">无</a-select-option>
</a-select>
</a-form-item>
</a-col>
<a-col :md="6" :sm="24">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="安全存量"> <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="安全存量">
<a-input placeholder="请输入安全存量" v-decorator.trim="[ 'safetyStock' ]" /> <a-input placeholder="请输入安全存量" v-decorator.trim="[ 'safetyStock' ]" />
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :lg="8" :md="12" :sm="24"> <a-col :md="6" :sm="24">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="保质期天数">
<a-input-number style="width: 100%" placeholder="请输入保质期天数" v-decorator.trim="[ 'expiryNum' ]" />
</a-form-item>
</a-col>
<a-col :md="6" :sm="24">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="多属性"> <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="多属性">
<a-switch checked-children="启用" un-checked-children="关闭" v-model="skuSwitch" :disabled="switchDisabled" @change="onSkuChange"></a-switch> <a-switch checked-children="启用" un-checked-children="关闭" v-model="skuSwitch" :disabled="switchDisabled" @change="onSkuChange"></a-switch>
</a-form-item> </a-form-item>
@@ -86,7 +99,7 @@
</a-row> </a-row>
<a-card v-if="skuSwitch"> <a-card v-if="skuSwitch">
<a-row class="form-row" :gutter="24"> <a-row class="form-row" :gutter="24">
<a-col :lg="8" :md="12" :sm="24"> <a-col :md="6" :sm="24">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" :label="sku.manyColor"> <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" :label="sku.manyColor">
<a-select mode="multiple" v-decorator="[ 'manyColor' ]" showSearch optionFilterProp="children"> <a-select mode="multiple" v-decorator="[ 'manyColor' ]" showSearch optionFilterProp="children">
<a-select-option v-for="(item,index) in sku.manyColorList" :key="index" :value="item.value"> <a-select-option v-for="(item,index) in sku.manyColorList" :key="index" :value="item.value">
@@ -95,7 +108,7 @@
</a-select> </a-select>
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :lg="8" :md="12" :sm="24"> <a-col :md="6" :sm="24">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" :label="sku.manySize"> <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" :label="sku.manySize">
<a-select mode="multiple" v-decorator="[ 'manySize' ]" showSearch optionFilterProp="children"> <a-select mode="multiple" v-decorator="[ 'manySize' ]" showSearch optionFilterProp="children">
<a-select-option v-for="(item,index) in sku.manySizeList" :key="index" :value="item.value"> <a-select-option v-for="(item,index) in sku.manySizeList" :key="index" :value="item.value">
@@ -104,7 +117,7 @@
</a-select> </a-select>
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :lg="8" :md="12" :sm="24"> <a-col :md="6" :sm="24">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" :label="sku.other1"> <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" :label="sku.other1">
<a-select mode="multiple" v-decorator="[ 'other1' ]" showSearch optionFilterProp="children"> <a-select mode="multiple" v-decorator="[ 'other1' ]" showSearch optionFilterProp="children">
<a-select-option v-for="(item,index) in sku.other1List" :key="index" :value="item.value"> <a-select-option v-for="(item,index) in sku.other1List" :key="index" :value="item.value">
@@ -115,7 +128,7 @@
</a-col> </a-col>
</a-row> </a-row>
<a-row class="form-row" :gutter="24"> <a-row class="form-row" :gutter="24">
<a-col :lg="8" :md="12" :sm="24"> <a-col :md="6" :sm="24">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" :label="sku.other2"> <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" :label="sku.other2">
<a-select mode="multiple" v-decorator="[ 'other2' ]" showSearch optionFilterProp="children"> <a-select mode="multiple" v-decorator="[ 'other2' ]" showSearch optionFilterProp="children">
<a-select-option v-for="(item,index) in sku.other2List" :key="index" :value="item.value"> <a-select-option v-for="(item,index) in sku.other2List" :key="index" :value="item.value">
@@ -124,7 +137,7 @@
</a-select> </a-select>
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :lg="8" :md="12" :sm="24"> <a-col :md="6" :sm="24">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" :label="sku.other3"> <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" :label="sku.other3">
<a-select mode="multiple" v-decorator="[ 'other3' ]" showSearch optionFilterProp="children"> <a-select mode="multiple" v-decorator="[ 'other3' ]" showSearch optionFilterProp="children">
<a-select-option v-for="(item,index) in sku.other3List" :key="index" :value="item.value"> <a-select-option v-for="(item,index) in sku.other3List" :key="index" :value="item.value">
@@ -133,7 +146,7 @@
</a-select> </a-select>
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :lg="8" :md="12" :sm="24"> <a-col :md="6" :sm="24">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="生成条码"> <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="生成条码">
<a-switch v-model="barCodeSwitch" @change="onBarCodeChange"></a-switch> <a-switch v-model="barCodeSwitch" @change="onBarCodeChange"></a-switch>
</a-form-item> </a-form-item>
@@ -394,7 +407,7 @@
} }
this.$nextTick(() => { this.$nextTick(() => {
this.form.setFieldsValue(pick(this.model, 'name', 'standard', 'unit', 'unitId', 'model', 'color', this.form.setFieldsValue(pick(this.model, 'name', 'standard', 'unit', 'unitId', 'model', 'color',
'categoryId','enableSerialNumber','safetyStock','remark','mfrs','otherField1','otherField2','otherField3')) 'categoryId','enableSerialNumber','enableBatchNumber','expiryNum','safetyStock','remark','mfrs','otherField1','otherField2','otherField3'))
}); });
this.initMaterialAttribute() this.initMaterialAttribute()
// 加载子表数据 // 加载子表数据