meswork/JY1.0
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

更新

Browse Source
This commit is contained in:
liushuai
2019-10-31 08:11:24 +08:00
parent d3ce0baf0b
commit ca02868500
15 changed files with 563 additions and 435 deletions
Download Patch File Download Diff File Expand all files Collapse all files

119
src/views/Inventory/StockInquiry/index.vue
View File

@@ -2,7 +2,7 @@
<div class="app-container">
<el-card>
<span style="margin-left: 10px">机床号:</span>
<el-select v-model="Machine" filterable clearable size="small" style="margin-top:10px;margin-bottom: 10px;width: 220px" placeholder="机床号" @change="getGroup()">
<el-select v-model="Machine" filterable clearable size="small" style="margin-top:10px;margin-bottom: 10px;width: 120px" placeholder="机床号" @change="getGroup()">
<el-option
v-for="item in Machines"
:key="item.value"
@@ -13,7 +13,7 @@
</el-option>
</el-select>
<span>组号:</span>
<el-select v-model="Group" size="small" clearable placeholder="组号" style="margin-top:10px;width: 180px;">
<el-select v-model="Group" size="small" clearable placeholder="组号" style="margin-top:10px;width: 120px;">
<el-option
v-for="item in Groups"
:key="item.value"
@@ -21,36 +21,32 @@
:value="item.value"/>
</el-select>
<span>零件图号:</span>
<el-input v-model="number" placeholder="零件号" clearable size="small" style="width: 180px;"/>
<el-button type="success" class="el-icon-search" size="small" style="margin: 10px 0 0 10px" @click="getTableData();pageCurrent=1;pageSize=15;total = 0">查询</el-button>
<el-input v-model="number" placeholder="零件号" clearable size="small" style="width: 120px;"/>
<el-button type="success" class="el-icon-search" size="small" style="margin: 10px 0 0 10px" @click="getTableData();pageCurrent=1;pageSize=500;total = 0">查询</el-button>
</el-card>
<el-card>
<el-card style="width: 49.5%; float: left">
<el-table
v-loading="listLoading1"
:data="tableData1"
stripe
size="mini"
style="width: 100%"
highlight-current-row
class="table"
border
height="550">
<el-table-column
label="序号"
align="center"
width="55"
type="index"/>
height="730">
<el-table-column align="center" label="零件名称" prop="零件名称" width="150px">
<template slot-scope="scope">
{{ scope.row.零件名称 }}
</template>
</el-table-column>
<el-table-column align="center" label="零件图号" prop="零件图号" width="150px">
<el-table-column align="center" label="零件图号" prop="零件图号" min-width="150px">
<template slot-scope="scope">
{{ scope.row.零件图号 }}
</template>
</el-table-column>
<el-table-column align="center" label="入库数量" width="120px">
<el-table-column align="center" label="入库数" width="70px">
<template slot-scope="scope">
{{ scope.row.入库数量 }}
</template>
@@ -60,24 +56,19 @@
{{ scope.row.机床图号 }}
</template>
</el-table-column>
<el-table-column align="center" label="组号" prop="组号" width="120px">
<el-table-column align="center" label="组号" prop="组号" width="80px">
<template slot-scope="scope">
{{ scope.row.组号 }}
</template>
</el-table-column>
<el-table-column align="center" label="仓库名称" width="120px">
<template slot-scope="scope">
{{ scope.row.仓库名称 }}
</template>
</el-table-column>
<el-table-column align="center" label="货位名称" prop="货位名称" width="120px">
<el-table-column align="center" label="货位名称" prop="货位名称" width="100px">
<template slot-scope="scope">
{{ scope.row.货位名称 }}
</template>
</el-table-column>
<el-table-column align="center" label="入库时间" prop="入库时间">
<el-table-column align="center" label="入库时间" prop="入库时间" width="100px">
<template slot-scope="scope">
{{ scope.row.入库时间 }}
{{ scope.row.入库时间 ? scope.row.入库时间.split(' ')[0] : '-' }}
</template>
</el-table-column>
</el-table>
@@ -85,7 +76,7 @@
<el-pagination
v-if="!listLoading1"
:current-page="pageCurrent"
:page-sizes="[15, 20, 30, 40]"
:page-sizes="[15, 20, 30, 500]"
:page-size="pageSize"
:total="total"
layout="total, sizes, prev, pager, next, jumper"
@@ -94,11 +85,71 @@
</div>
</el-card>
<el-card style="width: 49.5%; float: left;margin-left: 10px">
<el-table
v-loading="listLoading2"
:data="tableData0"
class="table"
stripe
size="mini"
style="width: 100%"
highlight-current-row
border
height="730">
<el-table-column align="center" label="零件名称" prop="零件名称" width="150px">
<template slot-scope="scope">
{{ scope.row.零件名称 }}
</template>
</el-table-column>
<el-table-column align="center" label="零件图号" prop="零件图号" min-idth="150px">
<template slot-scope="scope">
{{ scope.row.零件图号 }}
</template>
</el-table-column>
<el-table-column align="center" label="出库数" width="70px">
<template slot-scope="scope">
{{ scope.row.出库数量 }}
</template>
</el-table-column>
<el-table-column align="center" label="机床图号" prop="机床图号" width="120px">
<template slot-scope="scope">
{{ scope.row.机床图号 }}
</template>
</el-table-column>
<el-table-column align="center" label="组号" prop="组号" width="80px">
<template slot-scope="scope">
{{ scope.row.组号 }}
</template>
</el-table-column>
<el-table-column align="center" label="领料人" prop="出库备注" width="80px">
<template slot-scope="scope">
{{ scope.row.出库备注 }}
</template>
</el-table-column>
<el-table-column align="center" label="出库时间" prop="出库时间" width="100px">
<template slot-scope="scope">
{{ scope.row.出库时间 ? scope.row.出库时间.split(' ')[0] : '-' }}
</template>
</el-table-column>
</el-table>
<div class="block" style="margin-top: 10px;">
<el-pagination
v-if="!listLoading2"
:current-page="pageCurrent0"
:page-sizes="[15, 20, 30, 500]"
:page-size="pageSize0"
:total="total0"
layout="total, sizes, prev, pager, next, jumper"
@size-change="handleSizeChange"
@current-change="handleCurrentChange"/>
</div>
</el-card>
</div>
</template>
<script>
import { getMachines, getGroups, getTable } from '@/api/Inventory/StockInquiry'
import { getMachines, getGroups, getTable, getTable1 } from '@/api/Inventory/StockInquiry'
export default {
data() {
@@ -112,10 +163,15 @@ export default {
checkbox_Group: false,
checkbox_number: false,
tableData1: [],
tableData0: [],
listLoading1: false,
listLoading2: false,
total: 0, // 总条数
pageSize: 15,
pageCurrent: 1
pageSize: 500,
pageCurrent: 1,
total0: 0, // 总条数
pageSize0: 500,
pageCurrent0: 1
}
},
created() {
@@ -153,6 +209,7 @@ export default {
// 按条件查询
getTableData() {
this.listLoading1 = true
this.listLoading2 = true
if (this.Machine === '') {
this.checkbox_Machine = 0
} else {
@@ -169,6 +226,7 @@ export default {
this.checkbox_number = 1
}
this.tableData1 = []
this.tableData0 = []
getTable(this.checkbox_Machine, this.Machine, this.checkbox_Group, this.Group, this.checkbox_number, this.number, this.pageCurrent, this.pageSize).then(response => {
if (response.data.total === 0) {
this.listLoading1 = false
@@ -178,6 +236,15 @@ export default {
this.listLoading1 = false
}
})
getTable1(this.checkbox_Machine, this.Machine, this.checkbox_Group, this.Group, this.checkbox_number, this.number, this.pageCurrent0, this.pageSize0).then(response => {
if (response.data.total === 0) {
this.listLoading2 = false
} else {
this.tableData0 = response.data.rows
this.total0 = response.data.total
this.listLoading2 = false
}
})
},
handleSizeChange(val) {
this.pageCurrent = 1