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

Merge branch 'master' of http://123.56.95.229:10010/r/高精

Browse Source
This commit is contained in:
liushuai
2020-05-20 18:08:05 +08:00
parent 6e4a26aeed f1f3d933e8
commit 69cd14dd97
19 changed files with 1088 additions and 430 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/views/ManufacturingCenter/GroupMatching/index.vue
View File

@@ -27,7 +27,6 @@
<el-card>
<el-tabs v-model="PartType2" type="border-card" style="margin-top: 10px">
<el-tab-pane label="车间生产" name="车间生产">
<!--<h3 style="text-align: center;">车间生产</h3>-->
<el-table v-loading="loading" :data="tableData" :summary-method="getSummaries" style="width: 100%;margin-top: 6px" highlight-current-row height="600" size="mini" show-summary border stripe>
<el-table-column align="center" label="零件图号">
<template slot-scope="scope">
@@ -41,7 +40,7 @@
</el-table-column>
<el-table-column align="center" label="投产数量">
<template slot-scope="scope">
{{ scope.row.投产数量 }}
{{ scope.row.投产数 }}
</template>
</el-table-column>
<el-table-column align="center" label="入库数量">
@@ -87,7 +86,6 @@
</div>
</el-tab-pane>
<el-tab-pane label="采购部采购" name="采购部采购">
<!--<h3 style="text-align: center;">采购部采购</h3>-->
<el-tabs v-model="PartType" type="border-card" style="margin-top: 10px" @tab-click="searchTable()">
<el-tab-pane label="标准件" name="标准件">
<el-table :data="tableData00" size="mini" height="530px" border stripe>
@@ -328,7 +326,6 @@
</el-tabs>
</el-tab-pane>
<el-tab-pane label="制造部采购" name="制造部采购">
<!--<h3 style="text-align: center;">制造部采购</h3>-->
<el-table :data="tableData1" border style="width: 100%;margin-top: 6px;" height="600">
<el-table-column label="进程" align="center" min-width="80">
<template slot-scope="scope">
@@ -548,7 +545,12 @@ export default {
},
methods: {
turnTo() {
this.$router.push({ path: '/ManufacturingCenter/CompletionOfWorkshopComponents' })
this.$router.push({
path: '/ManufacturingCenter/CompletionOfWorkshopComponents',
query: {
机床流水号: this.Machine
}
})
},
searchData() {
this.totalNum = 0
@@ -572,14 +574,6 @@ export default {
this.total = parseInt(response.data.output[0].ItemCount)
this.loading = false
})
// searchTable22(this.check1, this.Machine, this.check2, this.Group, this.check3, this.year, this.check4, this.month, this.check5, this.time, this.pageCurrent, this.pageSize).then(response => {
// console.log(response.data, 123243)
// for (let i = 0; i < response.data.length; i++) {
// if (response.data[i].入库时间 !== null) {
// this.totalNum += 1
// }
// }
// })
searchTable1(this.check1, this.Machine, this.check2, this.Group, this.pageCurrent, this.pageSize).then(response => {
this.tableData1 = response.data.rows
this.total5 = parseInt(response.data.total)