Skip to content
GitLab
"eladmin-system/git@ustchcs.com:gujinli1118/eladmin.git" did not exist on "90c2bf906be00ee0956434dfdf5bbed42941e981"
Commit 8744e7eb authored by 季圣华's avatar 季圣华
Browse files

优化库存逻辑和单据sku

parent 7154492a
Hide whitespace changes
Inline Side-by-side
jshERP-web/src/components/jeecgbiz/modal/JSelectMaterialModal.vue
View file @ 8744e7eb
...@@ -100,7 +100,8 @@ ...@@ -100,7 +100,8 @@
{dataIndex: 'model', title: '型号', width: 80}, {dataIndex: 'model', title: '型号', width: 80},
{dataIndex: 'unit', title: '单位', width: 60}, {dataIndex: 'unit', title: '单位', width: 60},
{dataIndex: 'sku', title: '多属性', width: 100}, {dataIndex: 'sku', title: '多属性', width: 100},
{dataIndex: 'stock', title: '库存', width: 50}, {dataIndex: 'skuStock', title: '多属性库存', width: 100},
{dataIndex: 'stock', title: '商品库存', width: 100},
{dataIndex: 'expand', title: '扩展信息', width: 80} {dataIndex: 'expand', title: '扩展信息', width: 80}
], ],
scrollTrigger: {}, scrollTrigger: {},
......
jshERP-web/src/views/bill/modules/PurchaseBackModal.vue
View file @ 8744e7eb
...@@ -190,7 +190,7 @@ ...@@ -190,7 +190,7 @@
{ title: '单价', key: 'unitPrice', width: '5%', type: FormTypes.inputNumber}, { title: '单价', key: 'unitPrice', width: '5%', type: FormTypes.inputNumber},
{ title: '含税单价', key: 'taxUnitPrice', width: '5%', type: FormTypes.inputNumber, readonly: true}, { title: '含税单价', key: 'taxUnitPrice', width: '5%', type: FormTypes.inputNumber, readonly: true},
{ title: '金额', key: 'allPrice', width: '5%', type: FormTypes.inputNumber, statistics: true }, { title: '金额', key: 'allPrice', width: '5%', type: FormTypes.inputNumber, statistics: true },
{ title: '税率', key: 'taxRate', width: '3%', type: FormTypes.inputNumber,placeholder: '%'}, { title: '税率', key: 'taxRate', width: '4%', type: FormTypes.inputNumber,placeholder: '%'},
{ title: '税额', key: 'taxMoney', width: '4%', type: FormTypes.inputNumber, statistics: true, readonly: true}, { title: '税额', key: 'taxMoney', width: '4%', type: FormTypes.inputNumber, statistics: true, readonly: true},
{ title: '价税合计', key: 'taxLastMoney', width: '5%', type: FormTypes.inputNumber, statistics: true }, { title: '价税合计', key: 'taxLastMoney', width: '5%', type: FormTypes.inputNumber, statistics: true },
{ title: '备注', key: 'remark', width: '5%', type: FormTypes.input } { title: '备注', key: 'remark', width: '5%', type: FormTypes.input }
......
jshERP-web/src/views/bill/modules/SaleBackModal.vue
View file @ 8744e7eb
...@@ -193,9 +193,9 @@ ...@@ -193,9 +193,9 @@
validateRules: [{ required: true, message: '${title}不能为空' }] validateRules: [{ required: true, message: '${title}不能为空' }]
}, },
{ title: '单价', key: 'unitPrice', width: '5%', type: FormTypes.inputNumber}, { title: '单价', key: 'unitPrice', width: '5%', type: FormTypes.inputNumber},
{ title: '含税单价', key: 'taxUnitPrice', width: '6%', type: FormTypes.inputNumber, readonly: true}, { title: '含税单价', key: 'taxUnitPrice', width: '5%', type: FormTypes.inputNumber, readonly: true},
{ title: '金额', key: 'allPrice', width: '5%', type: FormTypes.inputNumber, statistics: true }, { title: '金额', key: 'allPrice', width: '5%', type: FormTypes.inputNumber, statistics: true },
{ title: '税率', key: 'taxRate', width: '3%', type: FormTypes.inputNumber,placeholder: '%'}, { title: '税率', key: 'taxRate', width: '4%', type: FormTypes.inputNumber,placeholder: '%'},
{ title: '税额', key: 'taxMoney', width: '4%', type: FormTypes.inputNumber, statistics: true, readonly: true}, { title: '税额', key: 'taxMoney', width: '4%', type: FormTypes.inputNumber, statistics: true, readonly: true},
{ title: '价税合计', key: 'taxLastMoney', width: '5%', type: FormTypes.inputNumber, statistics: true }, { title: '价税合计', key: 'taxLastMoney', width: '5%', type: FormTypes.inputNumber, statistics: true },
{ title: '备注', key: 'remark', width: '5%', type: FormTypes.input } { title: '备注', key: 'remark', width: '5%', type: FormTypes.input }
......
jshERP-web/src/views/bill/modules/SaleOutModal.vue
View file @ 8744e7eb
...@@ -193,9 +193,9 @@ ...@@ -193,9 +193,9 @@
validateRules: [{ required: true, message: '${title}不能为空' }] validateRules: [{ required: true, message: '${title}不能为空' }]
}, },
{ title: '单价', key: 'unitPrice', width: '5%', type: FormTypes.inputNumber}, { title: '单价', key: 'unitPrice', width: '5%', type: FormTypes.inputNumber},
{ title: '含税单价', key: 'taxUnitPrice', width: '6%', type: FormTypes.inputNumber, readonly: true}, { title: '含税单价', key: 'taxUnitPrice', width: '5%', type: FormTypes.inputNumber, readonly: true},
{ title: '金额', key: 'allPrice', width: '5%', type: FormTypes.inputNumber, statistics: true }, { title: '金额', key: 'allPrice', width: '5%', type: FormTypes.inputNumber, statistics: true },
{ title: '税率', key: 'taxRate', width: '3%', type: FormTypes.inputNumber,placeholder: '%'}, { title: '税率', key: 'taxRate', width: '4%', type: FormTypes.inputNumber,placeholder: '%'},
{ title: '税额', key: 'taxMoney', width: '4%', type: FormTypes.inputNumber, statistics: true, readonly: true}, { title: '税额', key: 'taxMoney', width: '4%', type: FormTypes.inputNumber, statistics: true, readonly: true},
{ title: '价税合计', key: 'taxLastMoney', width: '5%', type: FormTypes.inputNumber, statistics: true }, { title: '价税合计', key: 'taxLastMoney', width: '5%', type: FormTypes.inputNumber, statistics: true },
{ title: '备注', key: 'remark', width: '5%', type: FormTypes.input } { title: '备注', key: 'remark', width: '5%', type: FormTypes.input }
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment