This commit is contained in:
bryan sun
2019-10-31 17:13:36 +08:00
parent 4af98a6f65
commit c97874bbd5
6 changed files with 556 additions and 491 deletions

View File

@@ -1,125 +1,132 @@
<template>
<div class="app-container">
<el-card>
<span style="margin-left: 30%;font-size: 20px;">正在加工零件列表</span>
<el-table :data="tableData" border size="mini" highlight-current-row style="width: 1160px" stripe height="475px">
<el-table-column label="机床图号" show-overflow-tooltip prop="机床图号" align="center" width="100px">
<template slot-scope="scope">
{{ scope.row.机床图号 }}
</template>
</el-table-column>
<el-table-column label="机床名称" show-overflow-tooltip prop="机床名称" align="center" width="200px">
<template slot-scope="scope">
{{ scope.row.机床名称 }}
</template>
</el-table-column>
<el-table-column label="组号" prop="组号" align="center" width="50px">
<template slot-scope="scope">
{{ scope.row.组号 }}
</template>
</el-table-column>
<el-table-column label="零件图号" show-overflow-tooltip prop="零件图号" align="center" width="200px">
<template slot-scope="scope">
{{ scope.row.零件图号 }}
</template>
</el-table-column>
<el-table-column label="零件名称" show-overflow-tooltip prop="零件名称" align="center" width="100px">
<template slot-scope="scope">
{{ scope.row.零件名称 }}
</template>
</el-table-column>
<el-table-column label="零件数量" align="center" width="80px">
<template slot-scope="scope">
{{ scope.row.批次数量 }}
</template>
</el-table-column>
<el-table-column label="工序名称" prop="工艺名称" align="center" width="100px">
<template slot-scope="scope">
{{ scope.row.工艺名称 }}
</template>
</el-table-column>
<el-table-column label="工位" prop="终端编号" align="center" width="100px">
<template slot-scope="scope">
{{ scope.row.终端编号 }}
</template>
</el-table-column>
<el-table-column label="操作工" prop="姓名" align="center" width="100px">
<template slot-scope="scope">
{{ scope.row.姓名 }}
</template>
</el-table-column>
<el-table-column label="操作" align="center" width="120px">
<template slot-scope="scope">
<el-button
size="mini"
type="primary"
plain
icon="el-icon-search"
@click="viewProcedures(scope.row)">查看工序</el-button>
</template>
</el-table-column>
</el-table>
</el-card>
<el-card>
<span style="margin-left: 30%;font-size: 20px">待加工零件列表</span>
<el-table :data="tableData3" border size="mini" highlight-current-row style="width: 1160px" stripe height="475px">
<el-table-column label="机床图号" show-overflow-tooltip prop="机床图号" align="center" width="100px">
<template slot-scope="scope">
{{ scope.row.机床图号 }}
</template>
</el-table-column>
<el-table-column label="机床名称" show-overflow-tooltip prop="机床名称" align="center" width="200px">
<template slot-scope="scope">
{{ scope.row.机床名称 }}
</template>
</el-table-column>
<el-table-column label="组号" prop="组号" show-overflow-tooltip align="center" width="50px">
<template slot-scope="scope">
{{ scope.row.组号 }}
</template>
</el-table-column>
<el-table-column label="零件图号" show-overflow-tooltip prop="零件图号" align="center" width="200px">
<template slot-scope="scope">
{{ scope.row.零件图 }}
</template>
</el-table-column>
<el-table-column label="零件名称" show-overflow-tooltip prop="零件名称" align="center" min-width="100px">
<template slot-scope="scope">
{{ scope.row.零件名称 }}
</template>
</el-table-column>
<el-table-column label="零件数量" align="center" width="80px">
<template slot-scope="scope">
{{ scope.row.批次数量 }}
</template>
</el-table-column>
<el-table-column label="工序名称" prop="工艺名称" align="center" width="100px">
<template slot-scope="scope">
{{ scope.row.工艺名称 }}
</template>
</el-table-column>
<el-table-column label="工" prop="mes终端编号" align="center" width="100px">
<template slot-scope="scope">
{{ scope.row.mes终端编号 }}
</template>
</el-table-column>
<el-table-column label="操作工" prop="姓名" align="center" width="100px">
<template slot-scope="scope">
{{ scope.row.姓名 }}
</template>
</el-table-column>
<el-table-column label="操作" fixed="right" align="center" width="120">
<template slot-scope="scope">
<el-button
size="mini"
type="primary"
plain
icon="el-icon-search"
@click="viewProcedures(scope.row)">查看工序</el-button>
</template>
</el-table-column>
</el-table>
</el-card>
<el-row>
<el-col style="width: 850px">
<el-card style="width: 800px">
<span>加工日期{{ dateTime }}</span>
<span style="margin-left: 20%;font-size: 20px;">正在加工零件</span>
<el-table :data="tableData" border size="mini" highlight-current-row style="width: 785px" stripe height="800px">
<el-table-column label="机床图号" show-overflow-tooltip prop="机床图号" align="center" width="120px">
<template slot-scope="scope">
{{ scope.row.机床图号 }}
</template>
</el-table-column>
<!-- <el-table-column label="机床名称" show-overflow-tooltip prop="机床名称" align="center" width="200px">-->
<!-- <template slot-scope="scope">-->
<!-- {{ scope.row.机床名称 }}-->
<!-- </template>-->
<!-- </el-table-column>-->
<el-table-column label="组号" prop="组号" align="center" width="70px">
<template slot-scope="scope">
{{ scope.row.组号 }}
</template>
</el-table-column>
<el-table-column label="零件图号" show-overflow-tooltip prop="零件图号" align="center" width="180px">
<template slot-scope="scope">
{{ scope.row.零件图号 }}
</template>
</el-table-column>
<!-- <el-table-column label="零件名称" show-overflow-tooltip prop="零件名称" align="center" width="100px">-->
<!-- <template slot-scope="scope">-->
<!-- {{ scope.row.零件名称 }}-->
<!-- </template>-->
<!-- </el-table-column>-->
<el-table-column label="零件数" align="center" width="60px">
<template slot-scope="scope">
{{ scope.row.批次数量 }}
</template>
</el-table-column>
<el-table-column label="工序名称" show-overflow-tooltip prop="工艺名" align="center" width="70px">
<template slot-scope="scope">
{{ scope.row.工艺名称 }}
</template>
</el-table-column>
<el-table-column label="工位" prop="终端编号" align="center" width="70px">
<template slot-scope="scope">
{{ scope.row.终端编号 }}
</template>
</el-table-column>
<el-table-column label="操作工" prop="姓名" align="center" width="90px">
<template slot-scope="scope">
{{ scope.row.姓名 }}
</template>
</el-table-column>
<el-table-column label="操作" align="center" width="105px">
<template slot-scope="scope">
<el-button
size="mini"
type="primary"
plain
icon="el-icon-search"
@click="viewProcedures(scope.row)">查看工序</el-button>
</template>
</el-table-column>
</el-table>
</el-card>
</el-col>
<el-col style="width: 800px">
<el-card>
<span style="margin-left: 45%;font-size: 20px">待加工零件</span>
<el-table :data="tableData3" border size="mini" highlight-current-row style="width: 785px" stripe height="800px">
<el-table-column label="机床图号" show-overflow-tooltip prop="机床图号" align="center" width="120px">
<template slot-scope="scope">
{{ scope.row.机床图号 }}
</template>
</el-table-column>
<!-- <el-table-column label="机床名称" show-overflow-tooltip prop="机床名称" align="center" width="200px">-->
<!-- <template slot-scope="scope">-->
<!-- {{ scope.row.机床名称 }}-->
<!-- </template>-->
<!-- </el-table-column>-->
<el-table-column label="组号" prop="组号" show-overflow-tooltip align="center" width="70px">
<template slot-scope="scope">
{{ scope.row. }}
</template>
</el-table-column>
<el-table-column label="零件图号" show-overflow-tooltip prop="零件图号" align="center" width="180px">
<template slot-scope="scope">
{{ scope.row.零件图号 }}
</template>
</el-table-column>
<!-- <el-table-column label="零件名称" show-overflow-tooltip prop="零件名称" align="center" min-width="100px">-->
<!-- <template slot-scope="scope">-->
<!-- {{ scope.row.零件名称 }}-->
<!-- </template>-->
<!-- </el-table-column>-->
<el-table-column label="零件数" align="center" width="60px">
<template slot-scope="scope">
{{ scope.row.批次数量 }}
</template>
</el-table-column>
<el-table-column label="工序名称" prop="工艺名称" align="center" width="70px">
<template slot-scope="scope">
{{ scope.row.工艺名称 }}
</template>
</el-table-column>
<el-table-column label="工" prop="mes终端编号" align="center" width="70px">
<template slot-scope="scope">
{{ scope.row.mes终端编号 }}
</template>
</el-table-column>
<el-table-column label="操作" prop="姓名" align="center" width="90px">
<template slot-scope="scope">
{{ scope.row.姓名 }}
</template>
</el-table-column>
<el-table-column label="操作" align="center" width="105">
<template slot-scope="scope">
<el-button
size="mini"
type="primary"
plain
icon="el-icon-search"
@click="viewProcedures(scope.row)">查看工序</el-button>
</template>
</el-table-column>
</el-table>
</el-card>
</el-col>
</el-row>
<el-dialog v-el-drag-dialog :visible.sync="dialogFormVisible" title="工序完成情况" center style="min-height: 300px">
<el-row>
@@ -177,6 +184,7 @@
<script>
import { searchData, processingStatus, searchData1 } from '@/api/ManufacturingCenter/MachiningParts'
import { getNowShotTime } from '@/utils/tool'
export default {
data() {
return {
@@ -185,7 +193,8 @@ export default {
SparePartsNumber: '',
SparePartsName: '',
tableData2: [],
tableData3: []
tableData3: [],
dateTime: getNowShotTime()
}
},
mounted() {