Commit d2d2a2cf authored by 旭艳's avatar 旭艳

Merge branch 'dev' of http://94.191.100.41/tfmom/tf-mom-web into dev

parents 2515dc46 a18764f3
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
...@@ -146,6 +146,12 @@ export default { ...@@ -146,6 +146,12 @@ export default {
align-content: center; align-content: center;
margin-top: 10px; margin-top: 10px;
} }
.search-box-col{
width: 300px !important;
}
.w60{
width: 30px !important;
}
} }
</style> </style>
...@@ -38,7 +38,7 @@ export default { ...@@ -38,7 +38,7 @@ export default {
if (this.form.inventory && this.form.inventory.usableAmount) { if (this.form.inventory && this.form.inventory.usableAmount) {
return this.form.inventory.usableAmount return this.form.inventory.usableAmount
} else { } else {
return 1 return 99999
} }
} }
}, },
......
...@@ -115,7 +115,7 @@ export default { ...@@ -115,7 +115,7 @@ export default {
<style lang='scss'> <style lang='scss'>
.warehouseApply{ .warehouseApply{
width: 100%; width: 100%;
height: 100%; height: calc(100% - 50px);
box-sizing: border-box; box-sizing: border-box;
padding:0 4px; padding:0 4px;
.search-form-box-com .search-box-col{ .search-form-box-com .search-box-col{
......
Markdown is supported
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