diff --git a/jshERP-web/src/views/bill/dialog/BillDetail.vue b/jshERP-web/src/views/bill/dialog/BillDetail.vue
index 7f28d2ad..ebd67595 100644
--- a/jshERP-web/src/views/bill/dialog/BillDetail.vue
+++ b/jshERP-web/src/views/bill/dialog/BillDetail.vue
@@ -28,809 +28,809 @@
取消
-
-
-
-
-
-
- {{model.operTimeStr}}
-
-
-
-
- {{model.number}}
-
-
-
-
-
-
-
-
-
- {{model.remark}}
-
-
-
-
-
-
-
-
-
-
-
- {{model.operTimeStr}}
-
-
-
-
- {{model.number}}
-
-
-
-
-
-
-
-
-
- {{model.remark}}
-
-
-
-
-
-
-
-
-
-
-
- {{model.operTimeStr}}
-
-
-
-
- {{model.number}}
-
-
-
-
-
-
-
-
-
- {{model.remark}}
-
-
-
-
-
-
-
-
-
-
-
-
- {{model.organName}}
-
-
-
-
- {{model.operTimeStr}}
-
-
-
-
- {{model.number}}
-
-
-
-
- {{model.linkNumber}} {{model.billType}}
-
-
-
-
-
-
-
- {{model.remark}}
-
-
-
-
-
-
-
-
-
-
-
-
- {{model.organName}}
-
-
-
-
- {{model.operTimeStr}}
-
-
-
-
- {{model.number}}
-
-
-
-
- {{model.linkNumber}} {{model.billType}}
-
-
-
-
-
-
-
- {{model.remark}}
-
-
-
-
-
-
-
-
-
-
-
-
- {{model.organName}}
-
-
-
-
- {{model.operTimeStr}}
-
-
-
-
- {{model.number}}
-
-
-
-
- {{model.linkNumber}}
-
-
-
-
-
-
-
- {{model.remark}}
-
-
-
-
-
-
- {{model.discount}}%
-
-
-
-
- {{model.discountMoney}}
-
-
-
-
- {{model.discountLastMoney}}
-
-
-
-
- {{model.otherMoney}}
-
-
-
-
-
-
- {{model.accountName}}
-
-
-
-
- {{model.changeAmount}}
-
-
-
-
- {{model.debt}}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{model.organName}}
-
-
-
-
- {{model.operTimeStr}}
-
-
-
-
- {{model.number}}
-
-
-
-
- {{model.linkNumber}}
-
-
-
-
-
-
-
- {{model.remark}}
-
-
-
-
-
-
- {{model.discount}}%
-
-
-
-
- {{model.discountMoney}}
-
-
-
-
- {{model.discountLastMoney}}
-
-
-
-
- {{model.otherMoney}}
-
-
-
-
-
-
- {{model.accountName}}
-
-
-
-
- {{model.changeAmount}}
-
-
-
-
- {{model.debt}}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{model.organName}}
-
-
-
-
- {{model.operTimeStr}}
-
-
-
-
- {{model.number}}
-
-
-
-
-
-
-
-
- {{model.remark}}
-
-
-
-
-
-
-
-
-
-
-
-
- {{model.organName}}
-
-
-
-
- {{model.operTimeStr}}
-
-
-
-
- {{model.number}}
-
-
-
-
- {{model.linkNumber}}
-
-
-
-
-
-
-
-
-
-
-
- {{model.changeAmount}}
-
-
-
-
- {{model.changeAmount}}
-
-
-
-
- 0
-
-
-
-
- {{model.accountName}}
-
-
-
-
-
-
-
-
- {{model.remark}}
-
-
-
-
-
-
-
-
-
-
-
-
- {{model.organName}}
-
-
-
-
- {{model.operTimeStr}}
-
-
-
-
- {{model.number}}
-
-
-
-
- {{model.payType}}
-
-
-
-
-
-
-
-
-
-
-
- {{model.changeAmount}}
-
-
-
-
- {{model.changeAmount}}
-
-
-
-
- 0
-
-
-
-
- {{model.accountName}}
-
-
-
-
-
-
-
-
- {{model.remark}}
-
-
-
-
-
-
-
-
-
-
-
-
- {{model.organName}}
-
-
-
-
- {{model.operTimeStr}}
-
-
-
-
- {{model.number}}
-
-
-
-
- {{model.linkNumber}}
-
-
-
-
-
-
-
- {{model.remark}}
-
-
-
-
-
-
- {{model.discount}}%
-
-
-
-
- {{model.discountMoney}}
-
-
-
-
- {{model.discountLastMoney}}
-
-
-
-
- {{model.otherMoney}}
-
-
-
-
-
-
- {{model.accountName}}
-
-
-
-
- {{model.changeAmount}}
-
-
-
-
- {{model.debt}}
-
-
-
-
- {{model.salesManStr}}
-
-
-
-
-
-
-
-
-
-
-
-
- {{model.organName}}
-
-
-
-
- {{model.operTimeStr}}
-
-
-
-
- {{model.number}}
-
-
-
-
- {{model.salesManStr}}
-
-
-
-
-
-
-
- {{model.remark}}
-
-
-
-
-
-
-
-
-
-
-
-
- {{model.organName}}
-
-
-
-
- {{model.operTimeStr}}
-
-
-
-
- {{model.number}}
-
-
-
-
- {{model.linkNumber}}
-
-
-
-
-
-
-
- {{model.remark}}
-
-
-
-
-
-
- {{model.discount}}%
-
-
-
-
- {{model.discountMoney}}
-
-
-
-
- {{model.discountLastMoney}}
-
-
-
-
- {{model.otherMoney}}
-
-
-
-
-
-
- {{model.accountName}}
-
-
-
-
- {{model.changeAmount}}
-
-
-
-
- {{model.debt}}
-
-
-
-
- {{model.salesManStr}}
-
-
-
-
-
-
+
+
+
-
-
-
+
+
+
+ {{model.organName}}
+
+
+
+
+ {{model.operTimeStr}}
+
+
+
+
+ {{model.number}}
+
+
+
+
+ {{model.payType}}
-
-
+
+
+
+
+
+
+
+
+ {{model.changeAmount}}
+
+
+
+
+ {{model.changeAmount}}
+
+
+
+
+ 0
+
+
+
+
+ {{model.accountName}}
+
+
+
+
+
+
+
+
+ {{model.remark}}
+
+
+
+
+
+
+
+
+
+
+
+
+ {{model.organName}}
+
+
+
+
+ {{model.operTimeStr}}
+
+
+
+
+ {{model.number}}
+
+
+
+
+ {{model.linkNumber}}
+
+
+
+
+
+
+
+
+
+
+
+ {{model.changeAmount}}
+
+
+
+
+ {{model.changeAmount}}
+
+
+
+
+ 0
+
+
+
+
+ {{model.accountName}}
+
+
+
+
+
+
+
+
+ {{model.remark}}
+
+
+
+
+
+
+
+
+
+
+
+
+ {{model.organName}}
+
+
+
+
+ {{model.operTimeStr}}
+
+
+
+
+ {{model.number}}
+
+
+
+
+
+
+
+
+ {{model.remark}}
+
+
+
+
+
+
+
+
+
+
+
+
+ {{model.organName}}
+
+
+
+
+ {{model.operTimeStr}}
+
+
+
+
+ {{model.number}}
+
+
+
+
+ {{model.linkNumber}}
+
+
+
+
+
+
+
+ {{model.remark}}
+
+
+
+
+
+
+ {{model.discount}}%
+
+
+
+
+ {{model.discountMoney}}
+
+
+
+
+ {{model.discountLastMoney}}
+
+
+
+
+ {{model.otherMoney}}
+
+
+
+
+
+
+ {{model.accountName}}
+
+
+
+
+ {{model.changeAmount}}
+
+
+
+
+ {{model.debt}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{model.organName}}
+
+
+
+
+ {{model.operTimeStr}}
+
+
+
+
+ {{model.number}}
+
+
+
+
+ {{model.linkNumber}}
+
+
+
+
+
+
+
+ {{model.remark}}
+
+
+
+
+
+
+ {{model.discount}}%
+
+
+
+
+ {{model.discountMoney}}
+
+
+
+
+ {{model.discountLastMoney}}
+
+
+
+
+ {{model.otherMoney}}
+
+
+
+
+
+
+ {{model.accountName}}
+
+
+
+
+ {{model.changeAmount}}
+
+
+
+
+ {{model.debt}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{model.organName}}
+
+
+
+
+ {{model.operTimeStr}}
+
+
+
+
+ {{model.number}}
+
+
+
+
+ {{model.salesManStr}}
+
+
+
+
+
+
+
+ {{model.remark}}
+
+
+
+
+
+
+
+
+
+
+
+
+ {{model.organName}}
+
+
+
+
+ {{model.operTimeStr}}
+
+
+
+
+ {{model.number}}
+
+
+
+
+ {{model.linkNumber}}
+
+
+
+
+
+
+
+ {{model.remark}}
+
+
+
+
+
+
+ {{model.discount}}%
+
+
+
+
+ {{model.discountMoney}}
+
+
+
+
+ {{model.discountLastMoney}}
+
+
+
+
+ {{model.otherMoney}}
+
+
+
+
+
+
+ {{model.accountName}}
+
+
+
+
+ {{model.changeAmount}}
+
+
+
+
+ {{model.debt}}
+
+
+
+
+ {{model.salesManStr}}
+
+
+
+
+
+
+
+
+
+
+
+
+ {{model.organName}}
+
+
+
+
+ {{model.operTimeStr}}
+
+
+
+
+ {{model.number}}
+
+
+
+
+ {{model.linkNumber}}
+
+
+
+
+
+
+
+ {{model.remark}}
+
+
+
+
+
+
+ {{model.discount}}%
+
+
+
+
+ {{model.discountMoney}}
+
+
+
+
+ {{model.discountLastMoney}}
+
+
+
+
+ {{model.otherMoney}}
+
+
+
+
+
+
+ {{model.accountName}}
+
+
+
+
+ {{model.changeAmount}}
+
+
+
+
+ {{model.debt}}
+
+
+
+
+ {{model.salesManStr}}
+
+
+
+
+
+
+
+
+
+
+
+
+ {{model.organName}}
+
+
+
+
+ {{model.operTimeStr}}
+
+
+
+
+ {{model.number}}
+
+
+
+
+ {{model.linkNumber}} {{model.billType}}
+
+
+
+
+
+
+
+ {{model.remark}}
+
+
+
+
+
+
+
+
+
+
+
+
+ {{model.organName}}
+
+
+
+
+ {{model.operTimeStr}}
+
+
+
+
+ {{model.number}}
+
+
+
+
+ {{model.linkNumber}} {{model.billType}}
+
+
+
+
+
+
+
+ {{model.remark}}
+
+
+
+
+
+
+
+
+
+
+
+ {{model.operTimeStr}}
+
+
+
+
+ {{model.number}}
+
+
+
+
+
+
+
+
+
+ {{model.remark}}
+
+
+
+
+
+
+
+
+
+
+
+ {{model.operTimeStr}}
+
+
+
+
+ {{model.number}}
+
+
+
+
+
+
+
+
+
+ {{model.remark}}
+
+
+
+
+
+
+
+
+
+
+
+ {{model.operTimeStr}}
+
+
+
+
+ {{model.number}}
+
+
+
+
+
+
+
+
+
+ {{model.remark}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -883,24 +883,7 @@
columns:[],
//列定义
defColumns: [],
- allocationOutColumns: [
- { 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: '5%'},
- { title: '库存', dataIndex: 'stock', width: '5%'},
- { title: '调入仓库', dataIndex: 'anotherDepotName', width: '8%'},
- { title: '单位', dataIndex: 'unit', width: '4%'},
- { title: '多属性', dataIndex: 'sku', width: '4%'},
- { title: '数量', dataIndex: 'operNumber', width: '5%'},
- { title: '单价', dataIndex: 'unitPrice', width: '5%'},
- { title: '金额', dataIndex: 'allPrice', width: '5%'},
- { title: '备注', dataIndex: 'remark', width: '5%'}
- ],
- assembleColumns: [
- { title: '商品类型', dataIndex: 'mType',width:'7%'},
+ retailOutColumns: [
{ title: '仓库名称', dataIndex: 'depotName', width: '5%'},
{ title: '条码', dataIndex: 'barCode', width: '8%'},
{ title: '名称', dataIndex: 'name', width: '8%'},
@@ -915,8 +898,7 @@
{ title: '金额', dataIndex: 'allPrice', width: '5%'},
{ title: '备注', dataIndex: 'remark', width: '5%'}
],
- disassembleColumns: [
- { title: '商品类型', dataIndex: 'mType',width:'7%'},
+ retailBackColumns: [
{ title: '仓库名称', dataIndex: 'depotName', width: '5%'},
{ title: '条码', dataIndex: 'barCode', width: '8%'},
{ title: '名称', dataIndex: 'name', width: '8%'},
@@ -931,8 +913,7 @@
{ title: '金额', dataIndex: 'allPrice', width: '5%'},
{ title: '备注', dataIndex: 'remark', width: '5%'}
],
- otherInColumns: [
- { title: '仓库名称', dataIndex: 'depotName', width: '5%'},
+ purchaseOrderColumns: [
{ title: '条码', dataIndex: 'barCode', width: '8%'},
{ title: '名称', dataIndex: 'name', width: '8%'},
{ title: '规格', dataIndex: 'standard', width: '5%'},
@@ -942,47 +923,11 @@
{ title: '单位', dataIndex: 'unit', width: '4%'},
{ title: '多属性', dataIndex: 'sku', width: '4%'},
{ title: '数量', dataIndex: 'operNumber', width: '5%'},
+ { title: '已入库', dataIndex: 'finishNumber', width: '5%'},
{ title: '单价', dataIndex: 'unitPrice', width: '5%'},
{ title: '金额', dataIndex: 'allPrice', width: '5%'},
{ title: '备注', dataIndex: 'remark', width: '5%'}
],
- otherOutColumns: [
- { 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: '5%'},
- { title: '库存', dataIndex: 'stock', width: '5%'},
- { title: '单位', dataIndex: 'unit', width: '4%'},
- { title: '多属性', dataIndex: 'sku', width: '4%'},
- { title: '数量', dataIndex: 'operNumber', width: '5%'},
- { title: '单价', dataIndex: 'unitPrice', width: '5%'},
- { title: '金额', dataIndex: 'allPrice', width: '5%'},
- { title: '备注', dataIndex: 'remark', width: '5%'}
- ],
- purchaseBackColumns: [
- { 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: '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: '4%'},
- { title: '价税合计', dataIndex: 'taxLastMoney', width: '5%'},
- { title: '备注', dataIndex: 'remark', width: '5%'}
- ],
purchaseInColumns: [
{ title: '仓库名称', dataIndex: 'depotName', width: '5%'},
{ title: '条码', dataIndex: 'barCode', width: '8%'},
@@ -1005,52 +950,7 @@
{ title: '价税合计', dataIndex: 'taxLastMoney', width: '5%'},
{ title: '备注', dataIndex: 'remark', width: '5%'}
],
- purchaseOrderColumns: [
- { title: '条码', dataIndex: 'barCode', width: '8%'},
- { title: '名称', dataIndex: 'name', width: '8%'},
- { title: '规格', dataIndex: 'standard', width: '5%'},
- { title: '型号', dataIndex: 'model', width: '5%'},
- { title: '扩展信息', dataIndex: 'materialOther', width: '5%'},
- { title: '库存', dataIndex: 'stock', width: '5%'},
- { title: '单位', dataIndex: 'unit', width: '4%'},
- { title: '多属性', dataIndex: 'sku', width: '4%'},
- { title: '数量', dataIndex: 'operNumber', width: '5%'},
- { title: '已入库', dataIndex: 'finishNumber', width: '5%'},
- { title: '单价', dataIndex: 'unitPrice', width: '5%'},
- { title: '金额', dataIndex: 'allPrice', width: '5%'},
- { title: '备注', dataIndex: 'remark', width: '5%'}
- ],
- retailBackColumns: [
- { 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: '5%'},
- { title: '库存', dataIndex: 'stock', width: '5%'},
- { title: '单位', dataIndex: 'unit', width: '4%'},
- { title: '多属性', dataIndex: 'sku', width: '4%'},
- { title: '数量', dataIndex: 'operNumber', width: '5%'},
- { title: '单价', dataIndex: 'unitPrice', width: '5%'},
- { title: '金额', dataIndex: 'allPrice', width: '5%'},
- { title: '备注', dataIndex: 'remark', width: '5%'}
- ],
- retailOutColumns: [
- { 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: '5%'},
- { title: '库存', dataIndex: 'stock', width: '5%'},
- { title: '单位', dataIndex: 'unit', width: '4%'},
- { title: '多属性', dataIndex: 'sku', width: '4%'},
- { title: '数量', dataIndex: 'operNumber', width: '5%'},
- { title: '单价', dataIndex: 'unitPrice', width: '5%'},
- { title: '金额', dataIndex: 'allPrice', width: '5%'},
- { title: '备注', dataIndex: 'remark', width: '5%'}
- ],
- saleBackColumns: [
+ purchaseBackColumns: [
{ title: '仓库名称', dataIndex: 'depotName', width: '5%'},
{ title: '条码', dataIndex: 'barCode', width: '8%'},
{ title: '名称', dataIndex: 'name', width: '8%'},
@@ -1108,6 +1008,106 @@
{ title: '税额', dataIndex: 'taxMoney', width: '4%'},
{ title: '价税合计', dataIndex: 'taxLastMoney', width: '5%'},
{ title: '备注', dataIndex: 'remark', width: '5%'}
+ ],
+ saleBackColumns: [
+ { 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: '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: '4%'},
+ { title: '价税合计', dataIndex: 'taxLastMoney', width: '5%'},
+ { title: '备注', dataIndex: 'remark', width: '5%'}
+ ],
+ otherInColumns: [
+ { 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: '5%'},
+ { title: '库存', dataIndex: 'stock', width: '5%'},
+ { title: '单位', dataIndex: 'unit', width: '4%'},
+ { title: '多属性', dataIndex: 'sku', width: '4%'},
+ { title: '数量', dataIndex: 'operNumber', width: '5%'},
+ { title: '单价', dataIndex: 'unitPrice', width: '5%'},
+ { title: '金额', dataIndex: 'allPrice', width: '5%'},
+ { title: '备注', dataIndex: 'remark', width: '5%'}
+ ],
+ otherOutColumns: [
+ { 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: '5%'},
+ { title: '库存', dataIndex: 'stock', width: '5%'},
+ { title: '单位', dataIndex: 'unit', width: '4%'},
+ { title: '多属性', dataIndex: 'sku', width: '4%'},
+ { title: '数量', dataIndex: 'operNumber', width: '5%'},
+ { title: '单价', dataIndex: 'unitPrice', width: '5%'},
+ { title: '金额', dataIndex: 'allPrice', width: '5%'},
+ { title: '备注', dataIndex: 'remark', width: '5%'}
+ ],
+ allocationOutColumns: [
+ { 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: '5%'},
+ { title: '库存', dataIndex: 'stock', width: '5%'},
+ { title: '调入仓库', dataIndex: 'anotherDepotName', width: '8%'},
+ { title: '单位', dataIndex: 'unit', width: '4%'},
+ { title: '多属性', dataIndex: 'sku', width: '4%'},
+ { title: '数量', dataIndex: 'operNumber', width: '5%'},
+ { title: '单价', dataIndex: 'unitPrice', width: '5%'},
+ { title: '金额', dataIndex: 'allPrice', width: '5%'},
+ { title: '备注', dataIndex: 'remark', width: '5%'}
+ ],
+ assembleColumns: [
+ { title: '商品类型', dataIndex: 'mType',width:'7%'},
+ { 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: '5%'},
+ { title: '库存', dataIndex: 'stock', width: '5%'},
+ { title: '单位', dataIndex: 'unit', width: '4%'},
+ { title: '多属性', dataIndex: 'sku', width: '4%'},
+ { title: '数量', dataIndex: 'operNumber', width: '5%'},
+ { title: '单价', dataIndex: 'unitPrice', width: '5%'},
+ { title: '金额', dataIndex: 'allPrice', width: '5%'},
+ { title: '备注', dataIndex: 'remark', width: '5%'}
+ ],
+ disassembleColumns: [
+ { title: '商品类型', dataIndex: 'mType',width:'7%'},
+ { 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: '5%'},
+ { title: '库存', dataIndex: 'stock', width: '5%'},
+ { title: '单位', dataIndex: 'unit', width: '4%'},
+ { title: '多属性', dataIndex: 'sku', width: '4%'},
+ { title: '数量', dataIndex: 'operNumber', width: '5%'},
+ { title: '单价', dataIndex: 'unitPrice', width: '5%'},
+ { title: '金额', dataIndex: 'allPrice', width: '5%'},
+ { title: '备注', dataIndex: 'remark', width: '5%'}
]
}
},