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

更新

Browse Source
This commit is contained in:
liushuai
2020-01-01 20:21:48 +08:00
parent aadc7dadb4
commit cbe64d102b
3 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/views/ManufacturingCenter/ActualWorkQuery/index.vue
View File

@@ -48,7 +48,7 @@
</el-table-column> </el-table-column>
<el-table-column label="实际工时" align="center" width="100px"> <el-table-column label="实际工时" align="center" width="100px">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.实际加工时间段 || '—' }} {{ scope.row.设备工时 || '—' }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="计划工时" prop="理论加工时间段" align="center" width="100px"> <el-table-column label="计划工时" prop="理论加工时间段" align="center" width="100px">

6
src/views/ManufacturingCenter/ManHourStatistics/index.vue
View File

@@ -33,9 +33,9 @@
{{ scope.row.理论加工时间段 }} {{ scope.row.理论加工时间段 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="加工工时" align="center"> <el-table-column label="实际工时" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.实际加工时间段 }} {{ scope.row.设备工时 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="比例" align="center"> <el-table-column label="比例" align="center">
@@ -175,7 +175,7 @@ export default {
} }
searchtable(this.workerName_ckeck, this.workerName, this.timeCheck, this.startTime, this.endTime).then(response => { searchtable(this.workerName_ckeck, this.workerName, this.timeCheck, this.startTime, this.endTime).then(response => {
response.data.map(v => { response.data.map(v => {
this.$set(v, '比例', v.理论加工时间段 === 0 ? 0 : Math.round(v.实际加工时间段 / v.理论加工时间段 * 100) / 100.00) this.$set(v, '比例', v.理论加工时间段 === 0 ? 0 : Math.round(v.设备工时 / v.理论加工时间段 * 100) / 100.00)
}) })
this.tableData = response.data this.tableData = response.data
this.loading = false this.loading = false

7
src/views/ManufacturingCenter/ScheduleCompletionDetails/index.vue
View File

@@ -45,9 +45,9 @@
{{ scope.row.理论加工时间段 }} {{ scope.row.理论加工时间段 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="加工工时" align="center" width="70px"> <el-table-column label="实际工时" align="center" width="70px">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.实际加工时间段 }} {{ scope.row.设备工时 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="完成数量" align="center" width="70px"> <el-table-column label="完成数量" align="center" width="70px">
@@ -106,7 +106,7 @@
</el-table-column> </el-table-column>
<el-table-column label="加工工时" align="center" width="70px"> <el-table-column label="加工工时" align="center" width="70px">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.实际加工时间段 }} {{ scope.row.设备工时 ? scope.row.设备工时 : 0 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="加工开始" align="center" width="135px"> <el-table-column label="加工开始" align="center" width="135px">
@@ -197,6 +197,7 @@ export default {
工艺名称: response.data.rows[i].工艺名称, 工艺名称: response.data.rows[i].工艺名称,
完成数量: response.data.rows[i].完成数量, 完成数量: response.data.rows[i].完成数量,
质检结果: response.data.rows[i].质检结果, 质检结果: response.data.rows[i].质检结果,
设备工时: response.data.rows[i].设备工时,
不合格数量: response.data.rows[i].不合格数量, 不合格数量: response.data.rows[i].不合格数量,
理论加工时间段: response.data.rows[i].理论加工时间段, 理论加工时间段: response.data.rows[i].理论加工时间段,
实际加工时间段: response.data.rows[i].实际加工时间段, 实际加工时间段: response.data.rows[i].实际加工时间段,