Commit 34ea55c1 by wangchunyang

文字调整

parent 471defb7
......@@ -127,17 +127,17 @@
<div class="search-div">
<Row type="flex" :gutter="16">
<Col span="18">
<span>物料编码:</span>
<span>用品编码:</span>
<Input
v-model="filters.inventory.material_code"
placeholder="请输入物料编码"
placeholder="请输入用品编码"
class="mr10"
style="width: 200px"
/>
<span>物料名称:</span>
<span>用品名称:</span>
<Input
v-model="filters.inventory.material_name"
placeholder="请输入物料名称"
placeholder="请输入用品名称"
class="mr10"
style="width: 200px"
/>
......@@ -177,7 +177,7 @@
<Input type="textarea" v-model="inboundModal.form.remark" :rows="2" />
</FormItem>
<h4>明细(从物料库选择)
<h4>明细(从用品库选择)
<div style="float: right;">
<Button size="small" class="mr5" type="primary" @click="showMaterialSelector = true">添加</Button>
<Button size="small" type="error" @click="deleteSelectedInboundDetails">删除</Button>
......@@ -219,7 +219,7 @@
</div>
<div slot="footer"><Button type="primary" @click="detailModal.visible=false">关闭</Button></div>
</Modal>
<!-- 导入物料弹窗 -->
<!-- 导入用品弹窗 -->
<Modal v-model="importShow" title="入库导入" width="360">
<Row type="flex" justify="center" align="middle">
<Col span="10">
......@@ -364,8 +364,8 @@ export default {
],
inventoryColumns: [
{ type: 'index', title: '序号', width: 60, align: 'center' },
{ title: '物料编码', key: 'material_code', align: 'center' },
{ title: '物料名称', key: 'material_name', align: 'center' },
{ title: '用品编码', key: 'material_code', align: 'center' },
{ title: '用品名称', key: 'material_name', align: 'center' },
{ title: '总量', key: 'total_quantity', align: 'center' },
{ title: '借出', key: 'borrowed_quantity', align: 'center' },
{
......@@ -380,8 +380,8 @@ export default {
// 模态窗口内表格列定义
inboundDetailColumns: [
{ type: 'selection', width: 60 },
{ title: '物料编码', key: 'material_code', minWidth: 120 },
{ title: '物料名称', key: 'material_name', minWidth: 150 },
{ title: '用品编码', key: 'material_code', minWidth: 120 },
{ title: '用品名称', key: 'material_name', minWidth: 150 },
{ title: '入库数量',
key: 'inbound_quantity',
minWidth: 120,
......@@ -444,19 +444,19 @@ export default {
}
],
returnDetailColumns: [
{ title: '物料名称', key: 'material_name' },
{ title: '用品名称', key: 'material_name' },
{ title: '申请数量', key: 'apply_quantity' },
{ title: '归还数量', key: 'returned_quantity' }
],
detailDetailColumns: [
{ title: '物料编码', key: 'material_code' },
{ title: '物料名称', key: 'material_name' },
{ title: '用品编码', key: 'material_code' },
{ title: '用品名称', key: 'material_name' },
{ title: '数量', key: 'inbound_quantity' },
{ title: '单价', key: 'unit_price' }
],
detailLogsColumns: [
{
title: '物料名称',
title: '用品名称',
key: 'material_name'
},
{
......@@ -645,9 +645,9 @@ export default {
this.inboundSelectedDetails = list || []
},
handleInboundMaterialSelectorOk (selectedRows) {
console.log('选择的物料信息' + selectedRows)
console.log('选择的用品信息' + selectedRows)
if (!Array.isArray(selectedRows) || selectedRows.length === 0) {
this.$Message.warning('未选择物料')
this.$Message.warning('未选择用品')
return
}
selectedRows.forEach(sel => {
......
......@@ -9,8 +9,8 @@
<DatePicker v-model="usageStart" type="date" style="min-width:110px;margin-right:20px" />
<span>结束:</span>
<DatePicker v-model="usageEnd" type="date" style="min-width:110px;margin-right:20px" />
<span>物料</span>
<Input v-model="usageMaterial" placeholder="物料名称或编码" style="width: 150px" />
<span>用品</span>
<Input v-model="usageMaterial" placeholder="用品名称或编码" style="width: 150px" />
</Col>
<Col :span="4" class="text-right">
<Button type="primary" class="mr10" @click="loadUsage">统计</Button>
......@@ -125,7 +125,7 @@ export default {
this.detailModal.columns = [
{ title: '部门', key: 'department_name', align: 'center' },
{ title: '人员', key: 'user_name', align: 'center' },
{ title: '物料', key: 'material_name', align: 'center' },
{ title: '用品', key: 'material_name', align: 'center' },
{ title: '申请数量', key: 'apply_quantity', align: 'center' },
{ title: '已归还数量', key: 'returned_quantity', align: 'center' }
]
......@@ -210,8 +210,8 @@ export default {
let statusText = ''
switch (status) {
case 0: statusText = '未提交'; break
case 1: statusText = '审中'; break
case 9: statusText = '审通过'; break
case 1: statusText = '审中'; break
case 9: statusText = '审通过'; break
case -1: statusText = '驳回'; break
default: statusText = status
}
......@@ -244,7 +244,7 @@ export default {
}
},
{
title: '物料',
title: '用品',
key: 'material_name',
align: 'center'
},
......@@ -267,8 +267,8 @@ export default {
let statusText = ''
switch (status) {
case 0: statusText = '待提交'; break
case 1: statusText = '审中'; break
case 9: statusText = '审通过'; break
case 1: statusText = '审中'; break
case 9: statusText = '审通过'; break
case -1: statusText = '驳回'; break
default: statusText = status
}
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论