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

Merge branch 'master' of ssh://192.168.0.149:29418/高精2.0

Browse Source
This commit is contained in:
caoxinyu
2019-03-26 18:11:09 +08:00
parent f94d46abc2 65f3f8bb03
commit 93f67706fd
2 changed files with 21 additions and 22 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',
data: {
type: '1',
name: '车间生产管理工艺_工时统计_查询数据',
param: '操作者_check=' + num1 + '&操作者=' + num2 + '&时间_check=' + num3 + '&开始时间=' + num4 + '&结束时间=' + num5,
name: '车间生产管理工艺_工时统计_查询数据2',
param: '操作者_check=' + num1 + '&姓名=' + num2 + '&时间_check=' + num3 + '&开始时间=' + num4 + '&结束时间=' + num5,
Pagination: pageCurrent + '&' + pageSize
}
})
@@ -20,7 +20,7 @@ export function searchtable2(num1, num2, num3, num4, pageCurrent, pageSize) {
method: 'post',
data: {
type: '1',
name: '车间生产管理工艺_工时统计按人员查询_查询数据',
name: '车间生产管理工艺_工时统计按人员查询_查询数据2',
param: '工作者编号=' + num1 + '&时间_check=' + num2 + '&开始时间=' + num3 + '&结束时间=' + num4,
Pagination: pageCurrent + '&' + pageSize
}

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

@@ -25,21 +25,21 @@
</el-row>
</el-card>
<el-card>
<el-col :span="7">
<el-col :span="6">
<el-table v-loading="loading" :data="tableData" highlight-current-row height="580" style="width: 100%;" border element-loading-text="拼命加载中" @row-click="searchTable2">
<el-table-column
label=" "
type="index"
align="center"
width="50"/>
<el-table-column label="操作者" align="center" width="150px">
<el-table-column label="操作者" align="center" width="130px">
<template slot-scope="scope">
{{ scope.row.操作者 }}
{{ scope.row.姓名 }}
</template>
</el-table-column>
<el-table-column label="总工时" align="center">
<el-table-column label="实际工时" align="center">
<template slot-scope="scope">
{{ scope.row.工人总工时 }}
{{ scope.row.实际加工时间段 }}
</template>
</el-table-column>
</el-table>
@@ -54,7 +54,7 @@
@current-change="handleCurrentChange"/>
</div>
</el-col>
<el-col :span="16" style="margin-left: 30px;">
<el-col :span="17" style="margin-left: 30px;">
<el-table v-loading="loading2" :data="tableData2" height="580" style="width: 100%;" border element-loading-text="拼命加载中">
<el-table-column
label=" "
@@ -71,19 +71,24 @@
{{ scope.row.零件名称 }}
</template>
</el-table-column>
<el-table-column label="工艺名称" align="center" width="150px">
<el-table-column label="工艺名称" align="center" width="130px">
<template slot-scope="scope">
{{ scope.row.工艺名称 }}
</template>
</el-table-column>
<el-table-column label="工序工时" align="center" width="150px">
<el-table-column label="理论工时" align="center" width="100px">
<template slot-scope="scope">
{{ scope.row.工序工时 }}
{{ scope.row.理论加工时间段 }}
</template>
</el-table-column>
<el-table-column label="完成日期" align="center">
<el-table-column label="实际工时" align="center" width="100px">
<template slot-scope="scope">
{{ scope.row.完成日期 }}
{{ scope.row.实际加工时间段 }}
</template>
</el-table-column>
<el-table-column label="完成时间" align="center">
<template slot-scope="scope">
{{ scope.row.加工完成时间 }}
</template>
</el-table-column>
</el-table>
@@ -160,14 +165,11 @@ export default {
this.loading2 = true
this.tableData2 = []
this.pageCurrent2 = 1
this.gongzuozhebianhao = row.工作者编号
searchtable2(row.工作者编号, this.timeCheck, this.startTime, this.endTime, this.pageCurrent2, this.pageSize2).then(response => {
this.gongzuozhebianhao = row.人员编号
searchtable2(row.人员编号, this.timeCheck, this.startTime, this.endTime, this.pageCurrent2, this.pageSize2).then(response => {
if (response.data.total === 0) {
this.loading2 = false
} 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.tableData2 = response.data.rows
}
@@ -182,9 +184,6 @@ export default {
if (response.data.total === 0) {
this.loading2 = false
} 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.tableData2 = response.data.rows
}