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

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

Browse Source
This commit is contained in:
chenjianan
2019-05-30 09:47:32 +08:00
parent ab3c50f7f7 f4fe6af44d
commit b05ed32a60
7 changed files with 623 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -285,6 +285,13 @@
{{ scope.row.机床主管 }}
</template>
</el-table-column>
<el-table-column align="center" label="装配状态">
<template slot-scope="scope">
<el-tag v-if="scope.row.装配状态===null || scope.row.装配状态===0" type="success" size="small">未装配</el-tag>
<el-tag v-else-if="scope.row.装配状态===1" type="danger" size="small" >装配中</el-tag>
<el-tag v-else type="info" size="small" >装配完成</el-tag>
</template>
</el-table-column>
</el-table>
<div class="block" style="margin-top: 10px;">
<el-pagination
@@ -329,9 +336,11 @@
{{ scope.row.组件名称 }}
</template>
</el-table-column>
<el-table-column align="center" label="组件介绍">
<el-table-column align="center" label="装配状态">
<template slot-scope="scope">
{{ scope.row.组件介绍 }}
<el-tag v-if="scope.row.组件是否完成===null || scope.row.组件是否完成===0" type="success" size="small">未装配</el-tag>
<el-tag v-else-if="scope.row.组件是否完成===1" type="danger" size="small" >装配中</el-tag>
<el-tag v-else type="info" size="small" >装配完成</el-tag>
</template>
</el-table-column>
</el-table>