This commit is contained in:
lixin
2018-11-19 17:19:41 +08:00
parent 4cc6783700
commit 9b52cb0127
10 changed files with 210 additions and 108 deletions

View File

@@ -52,7 +52,7 @@
v-loading="loading"
:data="tableData"
style="width: 100%;max-height: 600px"
height="600"
height="300"
highlight-current-row
border>
<el-table-column align="center" label="序号" type="index" width="60"/>
@@ -103,7 +103,70 @@
@current-change="handleCurrentChange"/>
</div>
</el-card>
<el-card>
<el-table
v-loading="listLoading1"
:data="tableDataPurchase"
border
style="width: 100%;"
height="300">
<el-table-column
label="序号"
align="center"
type="index"
width="50"/>
<el-table-column label="物料名称" align="center" min-width="80">
<template slot-scope="scope">
{{ scope.row.物料名称 }}
</template>
</el-table-column>
<el-table-column label="物料规格" align="center" min-width="80">
<template slot-scope="scope">
{{ scope.row.物料规格 }}
</template>
</el-table-column>
<el-table-column label="物料型号" align="center" min-width="80">
<template slot-scope="scope">
{{ scope.row.物料型号 }}
</template>
</el-table-column>
<el-table-column label="项目名称" align="center" min-width="80">
<template slot-scope="scope">
{{ scope.row.项目名称 }}
</template>
</el-table-column>
<el-table-column label="机床图号" align="center" min-width="80">
<template slot-scope="scope">
{{ scope.row.机床图号 }}
</template>
</el-table-column>
<el-table-column label="组号" align="center" min-width="80">
<template slot-scope="scope">
{{ scope.row.组号 }}
</template>
</el-table-column>
<el-table-column label="零件数量" align="center" min-width="80">
<template slot-scope="scope">
{{ scope.row.货位存量 }}
</template>
</el-table-column>
<el-table-column label="零件类型" align="center" min-width="80">
<template slot-scope="scope">
{{ scope.row.类型名称 }}
</template>
</el-table-column>
</el-table>
<div class="block" style="margin-top: 10px;">
<el-pagination
:current-page="PageCurrent1"
:page-sizes="[10, 20, 30, 40]"
:page-size="10"
:total="total1"
layout="total, sizes, prev, pager, next, jumper"
@size-change="handleSizeChange1"
@current-change="handleCurrentChange1"/>
</div>
</el-card>
<el-dialog :visible.sync="dialogFormVisible2" title="选择机床" center style="min-height: 300px">
<el-table
:data="tableData6"
@@ -210,7 +273,7 @@
</template>
<script>
import { initProject, searchTable, searchmachine, searchgroup } from '@/api/ManufacturingCenter/GroupMatching'
import { initProject, searchTable, searchmachine, searchgroup, searchPurchaseTable } from '@/api/ManufacturingCenter/GroupMatching'
export default {
data() {
return {
@@ -286,7 +349,8 @@ export default {
}, {
value: 12,
label: '12'
}]
}],
tableDataPurchase: []
}
},
created() {
@@ -339,6 +403,12 @@ export default {
this.total = parseInt(response.data.total)
this.loading = false
})
searchPurchaseTable(this.check, this.entryNameValue, this.check1, this.machine, this.check2, this.groupNum, this.check3, this.year, this.check4, this.month, this.check5, this.time, this.pageCurrent, this.pageSize).then(response => {
console.log(response)
this.tableDataPurchase = response.data.rows
this.listLoading = false
this.total1 = response.data.total
})
} else {
this.loading = false
this.$message.warning('请先选择项目')