This commit is contained in:
liushuai
2019-09-19 19:52:46 +08:00
parent faab73c1fa
commit aef7132f40
49 changed files with 733 additions and 585 deletions

View File

@@ -7,7 +7,7 @@
v-model="startTime1"
value-format="yyyy-MM-dd"
size="small"
style="width: 160px"
style="width: 160px;margin-top: 10px"
type="date"
placeholder="选择日期"/>
<span class="demonstration">~</span>
@@ -37,7 +37,7 @@
</el-row>
<el-row>
<span>操作者:</span>
<el-input v-model="workerName" placeholder="操作者" size="small" clearable style="width:200px"/>
<el-input v-model="workerName" placeholder="操作者" size="small" clearable style="width:200px; margin-top: 10px;margin-bottom: 10px"/>
<span>零件图号:</span>
<el-input v-model="partNumber" placeholder="零件图号" size="small" clearable style="width:200px"/>
<span>工艺名称:</span>
@@ -48,8 +48,15 @@
</el-card>
<el-card>
<el-table :data="tableData" height="650" style="width: 100%;" border>
<el-table-column label="序号" type="index" align="center" width="50"/>
<el-table
:data="tableData"
height="440"
stripe="true"
size="mini"
highlight-current-row
style="width: 100%;"
border>
<el-table-column label="序号" type="index" align="center" width="55"/>
<el-table-column label="零件图号" align="center" min-width="150px">
<template slot-scope="scope">
{{ scope.row.零件图号 }}
@@ -60,12 +67,12 @@
{{ scope.row.零件名称 }}
</template>
</el-table-column>
<el-table-column label="完成数量" align="center" min-width="80px">
<el-table-column label="完成数量" align="center" min-width="100px">
<template slot-scope="scope">
{{ scope.row.完成数量 }}
</template>
</el-table-column>
<el-table-column label="工艺名称" align="center" min-width="80px">
<el-table-column label="工艺名称" align="center" min-width="100px">
<template slot-scope="scope">
{{ scope.row.工艺名称 }}
</template>
@@ -85,7 +92,7 @@
{{ scope.row.加工完成时间 || '—' }}
</template>
</el-table-column>
<el-table-column label="实际工时" align="center" min-width="80px">
<el-table-column label="实际工时" align="center" min-width="100px">
<template slot-scope="scope">
{{ scope.row.实际加工时间段 || '—' }}
</template>
@@ -116,20 +123,22 @@
{{ scope.row.修补人 || '—' }}
</template>
</el-table-column>
<el-table-column label="操作" align="center" width="240px" fixed="right">
<el-table-column label="操作" align="center" min-width="300" fixed="right">
<template slot-scope="scope">
<el-button v-if="scope.row.isEditing" type="mini" size="mini" icon="el-icon-circle-check-outline" @click="confirmEdit(scope.row)">确定</el-button>
<el-button v-if="scope.row.isEditing" class="cancel-btn" size="mini" type="warning" @click="cancelEdit(scope.row)">取消</el-button>
<el-button v-if="scope.row.isEditing" type="mini" plain size="mini" icon="el-icon-circle-check-outline" @click="confirmEdit(scope.row)">确定</el-button>
<el-button v-if="scope.row.isEditing" class="cancel-btn" plain size="mini" type="warning" @click="cancelEdit(scope.row)">取消</el-button>
<el-button
v-else
:disabled="!(scope.row.加工开始时间 || scope.row.加工完成时间)"
size="mini"
plain
type="primary"
class="el-icon-edit"
@click="handleEdit(scope.row)">编辑</el-button>
<el-button
:disabled="!!(scope.row.加工开始时间 || scope.row.加工完成时间)"
size="mini"
plain
type="danger"
class="el-icon-delete"
@click="handleDelete(scope.row)">删除</el-button>
@@ -526,4 +535,7 @@ export default {
span{
margin: 10px 0 10px 10px;
}
.el-card{
margin: 0px;
}
</style>