Commit 94a7ac2e by wangchunyang

样式调整,物料组件调整

parent 2eeb6f65
...@@ -1035,13 +1035,13 @@ export default { ...@@ -1035,13 +1035,13 @@ export default {
user_ids: userIds user_ids: userIds
}).then(ret => { }).then(ret => {
if (ret.data && ret.data.errcode === 0) { if (ret.data && ret.data.errcode === 0) {
this.fetchList("org") this.fetchList('org')
this.$Message.success('保存成功') this.$Message.success('保存成功')
this.userAssignModal.visible = false this.userAssignModal.visible = false
} else { } else {
this.$Notice.error({ title: '保存失败', desc: ret.data && ret.data.errmsg }) this.$Notice.error({ title: '保存失败', desc: ret.data && ret.data.errmsg })
} }
}).finally(() => { }) }).finally(() => {})
} }
} }
} }
......
...@@ -2,23 +2,19 @@ ...@@ -2,23 +2,19 @@
<Modal v-model="visible" title="选择物料" width="900" :mask-closable="false"> <Modal v-model="visible" title="选择物料" width="900" :mask-closable="false">
<div class="search-div"> <div class="search-div">
<Row type="flex" :gutter="16" align="middle"> <Row type="flex" :gutter="16" align="middle">
<Col :span="6"> <Col :span="18">
<span>分类:</span> <span>分类:</span>
<Select v-model="filters.category_id" clearable style="width: 100%"> <Select v-model="filters.category_id" clearable style="width: 130px" class="mr10">
<Option v-for="c in categoryOptions" :key="c.id" :value="c.id">{{ c.category_Name }}</Option> <Option v-for="c in categoryOptions" :key="c.id" :value="c.id">{{ c.category_name }}</Option>
</Select> </Select>
</Col>
<Col :span="6">
<span>物料编码:</span> <span>物料编码:</span>
<Input v-model="filters.material_code" placeholder="物料编码" /> <Input v-model="filters.material_code" placeholder="物料编码" style="width: 150px" class="mr10" />
</Col>
<Col :span="8">
<span>物料名称:</span> <span>物料名称:</span>
<Input v-model="filters.material_name" placeholder="物料名称" /> <Input v-model="filters.material_name" placeholder="物料名称" style="width: 150px" />
</Col> </Col>
<Col :span="4" class="text-right"> <Col :span="6" class="text-right">
<Button type="primary" class="mr10" @click="handleSearch">搜索</Button> <Button type="primary" class="mr10" @click="handleSearch">搜索</Button>
<Button @click="handleReset">重置</Button> <Button type="primary" @click="handleReset">重置</Button>
</Col> </Col>
</Row> </Row>
</div> </div>
...@@ -58,11 +54,11 @@ export default { ...@@ -58,11 +54,11 @@ export default {
categoryOptions: [], categoryOptions: [],
columns: [ columns: [
{ type: 'selection', width: 60 }, { type: 'selection', width: 60 },
{ title: '物料编码', key: 'material_code', align: 'center' }, { title: '分类', key: 'category_name', align: 'center', minWidth: 80 },
{ title: '物料名称', key: 'material_name', align: 'center' }, { title: '物料编码', key: 'material_code', align: 'center', minWidth: 100 },
{ title: '单位', key: 'unit', align: 'center', width: 80 }, { title: '物料名称', key: 'material_name', align: 'center', minWidth: 100 },
{ title: '可用库存', key: 'available_quantity', align: 'center', width: 120 }, { title: '单位', key: 'unit', align: 'center', minWidth: 80 },
{ title: '分类', key: 'category_Name', align: 'center' } { title: '可用库存', key: 'available_quantity', align: 'center', minWidth: 120 }
] ]
} }
}, },
...@@ -95,7 +91,7 @@ export default { ...@@ -95,7 +91,7 @@ export default {
}, },
fetchList () { fetchList () {
this.loading = true this.loading = true
const payload = { pageNo: this.pager.pageNo, pageSize: this.pager.pageSize, params: this.filters } const payload = Object.assign({ pageNo: this.pager.pageNo, pageSize: this.pager.pageSize }, this.filters)
getMaterialList(payload).then(ret => { getMaterialList(payload).then(ret => {
if (ret.data && ret.data.errcode === 0) { if (ret.data && ret.data.errcode === 0) {
const data = ret.data.data || {} const data = ret.data.data || {}
...@@ -146,4 +142,5 @@ export default { ...@@ -146,4 +142,5 @@ export default {
.search-div { border: 1px solid #dce1e7; padding: 12px; margin-bottom: 12px; background-color: #f8fbff; } .search-div { border: 1px solid #dce1e7; padding: 12px; margin-bottom: 12px; background-color: #f8fbff; }
.mr10 { margin-right: 10px; } .mr10 { margin-right: 10px; }
.page_style { margin-top: 12px; text-align: right; } .page_style { margin-top: 12px; text-align: right; }
.text-right { text-align: right; }
</style> </style>
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论