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

工时统计

Browse Source
This commit is contained in:
zhangdingyu
2019-03-26 16:59:56 +08:00
parent 26c97e85f6
commit e567e52a2a
2 changed files with 16 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/api/ManufacturingCenter/machiningHoursStatistics.js
View File

@@ -7,8 +7,8 @@ export function searchtable(num1, num2, num3, num4, num5, pageCurrent, pageSize)
method: 'post', method: 'post',
data: { data: {
type: '1', type: '1',
name: '车间生产管理工艺_工时统计_查询数据', name: '车间生产管理工艺_工时统计_查询数据2',
param: '操作者_check=' + num1 + '&操作者=' + num2 + '&时间_check=' + num3 + '&开始时间=' + num4 + '&结束时间=' + num5, param: '操作者_check=' + num1 + '&姓名=' + num2 + '&时间_check=' + num3 + '&开始时间=' + num4 + '&结束时间=' + num5,
Pagination: pageCurrent + '&' + pageSize Pagination: pageCurrent + '&' + pageSize
} }
}) })
@@ -20,7 +20,7 @@ export function searchtable2(num1, num2, num3, num4, pageCurrent, pageSize) {
method: 'post', method: 'post',
data: { data: {
type: '1', type: '1',
name: '车间生产管理工艺_工时统计按人员查询_查询数据', name: '车间生产管理工艺_工时统计按人员查询_查询数据2',
param: '工作者编号=' + num1 + '&时间_check=' + num2 + '&开始时间=' + num3 + '&结束时间=' + num4, param: '工作者编号=' + num1 + '&时间_check=' + num2 + '&开始时间=' + num3 + '&结束时间=' + num4,
Pagination: pageCurrent + '&' + pageSize Pagination: pageCurrent + '&' + pageSize
} }

27
src/views/ManufacturingCenter/machiningHoursStatistics/index.vue
View File

@@ -34,12 +34,12 @@
width="50"/> width="50"/>
<el-table-column label="操作者" align="center" width="150px"> <el-table-column label="操作者" align="center" width="150px">
<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">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.工人总工时 }} {{ scope.row.实际加工时间段 }}
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
@@ -76,14 +76,19 @@
{{ scope.row.工艺名称 }} {{ scope.row.工艺名称 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="工序工时" align="center" width="150px"> <el-table-column label="理论工时" align="center" width="150px">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.工序工时 }} {{ scope.row.理论加工时间段 }}
</template>
</el-table-column>
<el-table-column label="实际工时" align="center" width="150px">
<template slot-scope="scope">
{{ 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> </el-table>
@@ -160,14 +165,11 @@ export default {
this.loading2 = true this.loading2 = true
this.tableData2 = [] this.tableData2 = []
this.pageCurrent2 = 1 this.pageCurrent2 = 1
this.gongzuozhebianhao = row.工作者编号 this.gongzuozhebianhao = row.人员编号
searchtable2(row.工作者编号, this.timeCheck, this.startTime, this.endTime, this.pageCurrent2, this.pageSize2).then(response => { searchtable2(row.人员编号, this.timeCheck, this.startTime, this.endTime, this.pageCurrent2, this.pageSize2).then(response => {
if (response.data.total === 0) { if (response.data.total === 0) {
this.loading2 = false this.loading2 = false
} else { } else {
for (let i = 0; i < response.data.rows.length; i++) {
response.data.rows[i].完成日期 = response.data.rows[i].完成日期.split(' ')[0]
}
this.total2 = response.data.total this.total2 = response.data.total
this.tableData2 = response.data.rows this.tableData2 = response.data.rows
} }
@@ -182,9 +184,6 @@ export default {
if (response.data.total === 0) { if (response.data.total === 0) {
this.loading2 = false this.loading2 = false
} else { } else {
for (let i = 0; i < response.data.rows.length; i++) {
response.data.rows[i].完成日期 = response.data.rows[i].完成日期.split(' ')[0]
}
this.total2 = response.data.total this.total2 = response.data.total
this.tableData2 = response.data.rows this.tableData2 = response.data.rows
} }