This commit is contained in:
bryan sun
2019-10-17 18:09:52 +08:00
parent 81c161c81c
commit 5f791ce475
24 changed files with 789 additions and 196 deletions

View File

@@ -41,34 +41,34 @@
</el-card>
<el-card>
<el-table :data="tableData1" border size="mini" highlight-current-row stripe style="width: 100%" height="600px">
<el-table-column align="center" label="检验情况" width="80px">
<el-table-column align="center" sortable prop="是否合格" label="检验情况" width="80px">
<template slot-scope="scope">
<el-tag v-if="parseInt(scope.row.是否合格)===0||scope.row.是否合格===''" type="primary" size="small" @click="approvalPass(scope.row)">未检验</el-tag>
<el-tag v-if="parseInt(scope.row.是否合格)===1" type="success" size="small">合格</el-tag>
<el-tag v-if="parseInt(scope.row.是否合格)===2" type="error" size="small">不合格</el-tag>
</template>
</el-table-column>
<el-table-column label="机床图号" align="center" width="120px">
<el-table-column label="机床图号" sortable prop="机床图号" align="center" width="120px">
<template slot-scope="scope">
{{ scope.row.机床图号 }}
</template>
</el-table-column>
<el-table-column label="机床名称" align="center" width="260px">
<el-table-column label="机床名称" sortable prop="机床名称" align="center" width="260px">
<template slot-scope="scope">
{{ scope.row.机床名称 }}
</template>
</el-table-column>
<el-table-column label="组号" align="center" width="100px">
<el-table-column label="组号" sortable prop="组号" align="center" width="100px">
<template slot-scope="scope">
{{ scope.row.组号 }}
</template>
</el-table-column>
<el-table-column label="部件名称" align="center" width="100px">
<el-table-column label="部件名称" sortable prop="组件名称" align="center" width="100px">
<template slot-scope="scope">
{{ scope.row.组件名称 }}
</template>
</el-table-column>
<el-table-column label="检测项" align="center" width="100px">
<el-table-column label="检测项" sortable prop="检测项" align="center" width="100px">
<template slot-scope="scope">
{{ scope.row.检测项 }}
</template>

View File

@@ -256,27 +256,27 @@
<el-card>
<h4 style="margin-left: 45%;">正在加工零件列表</h4>
<el-table :data="tableData10" border size="mini" highlight-current-row style="width: 100%" stripe height="475px">
<el-table-column label="机床图号" align="center">
<el-table-column label="机床图号" sortable prop="机床图号" align="center">
<template slot-scope="scope">
{{ scope.row.机床图号 }}
</template>
</el-table-column>
<el-table-column label="机床名称" align="center" min-width="200px">
<el-table-column label="机床名称" sortable prop="机床名称" align="center" min-width="200px">
<template slot-scope="scope">
{{ scope.row.机床名称 }}
</template>
</el-table-column>
<el-table-column label="组号" align="center">
<el-table-column label="组号" sortable prop="组号" align="center">
<template slot-scope="scope">
{{ scope.row.组号 }}
</template>
</el-table-column>
<el-table-column label="零件图号" align="center" min-width="110px">
<el-table-column label="零件图号" sortable prop="零件图号" align="center" min-width="110px">
<template slot-scope="scope">
{{ scope.row.零件图号 }}
</template>
</el-table-column>
<el-table-column label="零件名称" align="center">
<el-table-column label="零件名称" sortable prop="零件名称" align="center">
<template slot-scope="scope">
{{ scope.row.零件名称 }}
</template>
@@ -286,17 +286,17 @@
{{ scope.row.批次数量 }}
</template>
</el-table-column>
<el-table-column label="工序名称" align="center">
<el-table-column label="工序名称" sortable prop="工艺名称" align="center">
<template slot-scope="scope">
{{ scope.row.工艺名称 }}
</template>
</el-table-column>
<el-table-column label="工位" align="center" width="100px">
<el-table-column label="工位" sortable prop="终端编号" align="center" width="100px">
<template slot-scope="scope">
{{ scope.row.终端编号 }}
</template>
</el-table-column>
<el-table-column label="操作工" align="center">
<el-table-column label="操作工" sortable prop="姓名" align="center">
<template slot-scope="scope">
{{ scope.row.姓名 }}
</template>
@@ -326,27 +326,27 @@
<el-card>
<h4 style="margin-left: 45%;">待加工零件列表</h4>
<el-table :data="tableData20" border size="mini" highlight-current-row style="width: 100%" stripe height="475px">
<el-table-column label="机床图号" align="center" width="110px">
<el-table-column label="机床图号" sortable prop="机床图号" align="center" width="110px">
<template slot-scope="scope">
{{ scope.row.机床图号 }}
</template>
</el-table-column>
<el-table-column label="机床名称" align="center" min-width="200px">
<el-table-column label="机床名称" sortable prop="机床名称" align="center" min-width="200px">
<template slot-scope="scope">
{{ scope.row.机床名称 }}
</template>
</el-table-column>
<el-table-column label="组号" align="center" width="70px">
<el-table-column label="组号" sortable prop="组号" align="center" width="70px">
<template slot-scope="scope">
{{ scope.row.组号 }}
</template>
</el-table-column>
<el-table-column label="零件图号" align="center" width="140px">
<el-table-column label="零件图号" sortable prop="零件图号" align="center" width="140px">
<template slot-scope="scope">
{{ scope.row.零件图号 }}
</template>
</el-table-column>
<el-table-column label="零件名称" align="center" min-width="120px">
<el-table-column label="零件名称" sortable prop="零件名称" align="center" min-width="120px">
<template slot-scope="scope">
{{ scope.row.零件名称 }}
</template>
@@ -356,17 +356,17 @@
{{ scope.row.批次数量 }}
</template>
</el-table-column>
<el-table-column label="工序名称" align="center">
<el-table-column label="工序名称" sortable prop="工艺名称" align="center">
<template slot-scope="scope">
{{ scope.row.工艺名称 }}
</template>
</el-table-column>
<el-table-column label="工位" align="center" width="80px">
<el-table-column label="工位" sortable prop="mes终端编号" align="center" width="80px">
<template slot-scope="scope">
{{ scope.row.mes终端编号 }}
</template>
</el-table-column>
<el-table-column label="操作工" align="center">
<el-table-column label="操作工" sortable prop="姓名" align="center">
<template slot-scope="scope">
{{ scope.row.姓名 }}
</template>