This commit is contained in:
bryan sun
2019-10-24 15:45:13 +08:00
parent a6fee1fea0
commit f65eb643fb
20 changed files with 520 additions and 532 deletions

View File

@@ -61,7 +61,7 @@
:label="item.label"
:value="item.value"/>
</el-select>
<el-button type="success" size="small" icon="el-icon-search" style="margin-left: 15px" @click="pageSize=10; pageCurrent= 1;selecttable()">查询</el-button>
<el-button type="success" size="small" icon="el-icon-search" style="margin-left: 15px" @click="pageSize=20; pageCurrent= 1;selecttable()">查询</el-button>
<el-tooltip :open-delay="1000" effect="dark" content="导出查询数据" placement="top">
<el-button type="primary" size="small" icon="el-icon-download" style="margin-left:10px" @click="exportExcel()">导出</el-button>
</el-tooltip>
@@ -254,7 +254,7 @@
</div>
</el-card>
<el-card>
<h4 style="margin-left: 45%;">正在加工零件列表</h4>
<span style="margin-left: 45%;font-size: 20px;">正在加工零件列表</span>
<el-table :data="tableData10" border size="mini" highlight-current-row style="width: 100%" stripe height="475px">
<el-table-column label="机床图号" prop="机床图号" align="center">
<template slot-scope="scope">
@@ -312,19 +312,19 @@
</template>
</el-table-column>
</el-table>
<div class="block">
<el-pagination
:current-page="pageCurrent1"
:page-sizes="[10, 20, 30, 40, 100]"
:page-size="pageSize1"
:total="total1"
layout="total, sizes, prev, pager, next, jumper"
@size-change="handleSizeChange1"
@current-change="handleCurrentChange1"/>
</div>
<!-- <div class="block">-->
<!-- <el-pagination-->
<!-- :current-page="pageCurrent1"-->
<!-- :page-sizes="[10, 20, 30, 40, 100]"-->
<!-- :page-size="pageSize1"-->
<!-- :total="total1"-->
<!-- layout="total, sizes, prev, pager, next, jumper"-->
<!-- @size-change="handleSizeChange1"-->
<!-- @current-change="handleCurrentChange1"/>-->
<!-- </div>-->
</el-card>
<el-card>
<h4 style="margin-left: 45%;">待加工零件列表</h4>
<span style="margin-left: 45%;font-size: 20px">待加工零件列表</span>
<el-table :data="tableData20" border size="mini" highlight-current-row style="width: 100%" stripe height="475px">
<el-table-column label="机床图号" prop="机床图号" align="center" width="110px">
<template slot-scope="scope">
@@ -382,16 +382,16 @@
</template>
</el-table-column>
</el-table>
<div class="block">
<el-pagination
:current-page="pageCurrent2"
:page-sizes="[10, 20, 30, 40, 100]"
:page-size="pageSize2"
:total="total2"
layout="total, sizes, prev, pager, next, jumper"
@size-change="handleSizeChange2"
@current-change="handleCurrentChange2"/>
</div>
<!-- <div class="block">-->
<!-- <el-pagination-->
<!-- :current-page="pageCurrent2"-->
<!-- :page-sizes="[10, 20, 30, 40, 100]"-->
<!-- :page-size="pageSize2"-->
<!-- :total="total2"-->
<!-- layout="total, sizes, prev, pager, next, jumper"-->
<!-- @size-change="handleSizeChange2"-->
<!-- @current-change="handleCurrentChange2"/>-->
<!-- </div>-->
</el-card>
<el-dialog v-el-drag-dialog :visible.sync="dialogFormVisible4" title="工序完成情况" center style="min-height: 300px">
<el-row>
@@ -402,7 +402,7 @@
</el-row>
<el-table
:data="tableData5"
style="width: 100%;max-height: 400px;margin-top: 20px"
style="width: 100%;margin-top: 20px"
size="mini"
height="300"
stripe
@@ -494,14 +494,14 @@ export default {
dialogFormVisible4: false,
loading: false,
total: 0, // 总条数
pageSize: 10, // 每页显示条数
pageCurrent: 1, // 后台获取页
total1: 0, // 总条数
pageSize1: 10, // 每页显示条数
pageCurrent1: 1, // 后台获取页
total2: 0, // 总条数
pageSize2: 10, // 每页显示条数
pageCurrent2: 1 // 后台获取页
pageSize: 20, // 每页显示条数
pageCurrent: 1 // 后台获取页
// total1: 0, // 总条数
// pageSize1: 10, // 每页显示条数
// pageCurrent1: 1, // 后台获取页
// total2: 0, // 总条数
// pageSize2: 10, // 每页显示条数
// pageCurrent2: 1 // 后台获取页
}
},
created() {
@@ -595,15 +595,15 @@ export default {
})
},
fetchData() {
searchData(this.pageSize1, this.pageCurrent1).then(response => {
this.tableData10 = response.data.rows
searchData().then(response => {
this.tableData10 = response.data
this.total1 = response.data.total
})
},
fetchData1() {
searchData1(this.pageSize2, this.pageCurrent2).then(response => {
searchData1().then(response => {
console.log(response)
this.tableData20 = response.data.rows
this.tableData20 = response.data
this.total2 = response.data.total
})
},
@@ -672,25 +672,25 @@ export default {
handleCurrentChange(val) {
this.pageCurrent = val
this.selecttable()
},
handleSizeChange1(val) {
this.pageCurrent1 = 1
this.pageSize1 = val
this.fetchData()
},
handleCurrentChange1(val) {
this.pageCurrent1 = val
this.fetchData()
},
handleSizeChange2(val) {
this.pageCurrent2 = 1
this.pageSize2 = val
this.fetchData1()
},
handleCurrentChange2(val) {
this.pageCurrent2 = val
this.fetchData1()
}
// handleSizeChange1(val) {
// this.pageCurrent1 = 1
// this.pageSize1 = val
// this.fetchData()
// },
// handleCurrentChange1(val) {
// this.pageCurrent1 = val
// this.fetchData()
// },
// handleSizeChange2(val) {
// this.pageCurrent2 = 1
// this.pageSize2 = val
// this.fetchData1()
// },
// handleCurrentChange2(val) {
// this.pageCurrent2 = val
// this.fetchData1()
// }
}
}