This commit is contained in:
Vergil
2020-05-18 11:35:25 +08:00
parent cd622ee59e
commit ca3574dce5
3 changed files with 23 additions and 59 deletions

View File

@@ -1,25 +1,7 @@
<template>
<div class="app-container">
<el-card style="width: 1255px">
<el-card>
<el-row>
<!--<span>项目名称:</span>-->
<!--<el-select-->
<!--v-model="entryNameValue"-->
<!--:remote-method="remoteMethod"-->
<!--placeholder="项目名称"-->
<!--style="margin-right: 10px; width: 150px"-->
<!--size="small"-->
<!--clearable-->
<!--filterable-->
<!--remote-->
<!--@change="projectChange"-->
<!--@focus="projectInit">-->
<!--<el-option-->
<!--v-for="item in entryName"-->
<!--:key="item.value"-->
<!--:label="item.label"-->
<!--:value="item.value"/>-->
<!--</el-select>-->
<el-select v-model="machineNameValue" placeholder="机床图号" style="width: 150px" size="small" filterable clearable @change="machineChange">
<el-option
v-for="item in machineName"
@@ -42,18 +24,9 @@
</el-row>
</el-card>
<el-row>
<el-col style="width: 825px">
<el-card style="margin-top: 15px;width: 825px">
<el-table
v-loading="listLoading"
:data="tableData"
style="width: 100%"
stripe
size="small"
height="590"
highlight-current-row
border
@row-click="fetchTableData2">
<el-col>
<el-card style="margin-top: 15px">
<el-table v-loading="listLoading" :data="tableData" style="width: 100%" stripe size="small" height="590" highlight-current-row border @row-click="fetchTableData2">
<el-table-column align="center" label="机床图号" width="120px" show-overflow-tooltip fixed>
<template slot-scope="scope">
{{ scope.row.机床图号 }}
@@ -64,12 +37,12 @@
{{ scope.row.组号 }}
</template>
</el-table-column>
<el-table-column align="center" label="零件图号" width="173px" show-overflow-tooltip fixed>
<el-table-column align="center" label="零件图号" width="140px" show-overflow-tooltip fixed>
<template slot-scope="scope">
{{ scope.row.零件图号 }}
</template>
</el-table-column>
<el-table-column align="center" label="零件名称" width="129px" show-overflow-tooltip fixed>
<el-table-column align="center" label="零件名称" width="100px" show-overflow-tooltip fixed>
<template slot-scope="scope">
{{ scope.row.零件名称 }}
</template>
@@ -89,22 +62,22 @@
{{ scope.row.报废人 }}
</template>
</el-table-column>
<el-table-column align="center" label="报废工序" width="85px">
<el-table-column align="center" label="报废工序" width="80px">
<template slot-scope="scope">
{{ scope.row.工艺名称 }}
</template>
</el-table-column>
<el-table-column align="center" label="报废原因" width="100px" show-overflow-tooltip>
<el-table-column align="center" label="报废原因" width="80px" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.报废原因 }}
</template>
</el-table-column>
<el-table-column align="center" label="操作工人" width="100px" show-overflow-tooltip>
<el-table-column align="center" label="操作工人" width="80px" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.操作工 === '超级管理员' ? '' : scope.row.操作工 }}
</template>
</el-table-column>
<el-table-column align="center" label="报废备注" width="140px" show-overflow-tooltip>
<el-table-column align="center" label="报废备注" width="100px" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.备注 }}
</template>
@@ -142,16 +115,9 @@
</div>
</el-card>
</el-col>
<el-col style="width: 430px">
<el-col>
<el-card>
<el-table
:data="tableData2"
element-loading-text="拼命加载中"
element-loading-spinner="el-icon-loading"
element-loading-background="rgba(226,223,223,1)"
height="630"
border
style="width: 430px">
<el-table :data="tableData2" element-loading-text="拼命加载中" element-loading-spinner="el-icon-loading" element-loading-background="rgba(226,223,223,1)" height="630" border style="width: 430px">
<el-table-column
width="50px"
prop="province1"