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

Merge branch 'master' of http://192.168.0.149:10010/r/高精2.0

Browse Source
This commit is contained in:
liushuai
2019-10-29 16:36:38 +08:00
parent 4f5db3ff46 945b6b7ba0
commit d1939c0e42
2 changed files with 20 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -19,9 +19,14 @@
</el-card>
<el-card>
<el-table v-loading="loading" :data="tableData" stripe height="700" size="mini" style="width: 1360px;" border>
<el-table v-loading="loading" :data="tableData" stripe height="700" size="mini" style="width: 1050px;" border>
<el-table-column label="序号" type="index" align="center" width="55"/>
<el-table-column label="零件图号" prop="零件图号" align="center" width="150px">
<el-table-column label="操作者" prop="姓名" align="center" width="80px">
<template slot-scope="scope">
{{ scope.row.姓名 }}
</template>
</el-table-column>
<el-table-column label="零件图号" sortable prop="零件图号" align="center" width="150px">
<template slot-scope="scope">
{{ scope.row.零件图号 }}
</template>
@@ -41,9 +46,14 @@
{{ scope.row.工艺名称 }}
</template>
</el-table-column>
<el-table-column label="操作者" prop="姓名" align="center" width="80px">
<el-table-column label="实际工时" align="center" width="70px">
<template slot-scope="scope">
{{ scope.row.姓名 }}
{{ scope.row.实际加工时间段 || '—' }}
</template>
</el-table-column>
<el-table-column label="计划工时" prop="理论加工时间段" align="center" width="90px">
<template slot-scope="scope">
{{ isShow ? scope.row.理论加工时间段 : '-' }}
</template>
</el-table-column>
<el-table-column label="实际开始时间" align="center" width="160px">
@@ -56,37 +66,6 @@
{{ scope.row.加工完成时间1 }}
</template>
</el-table-column>
<el-table-column label="实际工时" align="center" width="70px">
<template slot-scope="scope">
{{ scope.row.实际加工时间段 || '—' }}
</template>
</el-table-column>
<el-table-column label="修补数量" align="center" width="70px">
<template slot-scope="scope">
<template v-if="scope.row.isEditing">
<el-input v-model="scope.row.数量" class="edit-input" size="mini"/>
</template>
<span v-else>{{ scope.row.数量 }}</span>
</template>
</el-table-column>
<el-table-column label="修补工时" align="center" width="70px">
<template slot-scope="scope">
<template v-if="scope.row.isEditing">
<el-input v-model="scope.row.修补工时" class="edit-input" size="mini"/>
</template>
<span v-else>{{ scope.row.修补工时 }}</span>
</template>
</el-table-column>
<el-table-column label="修补操作时间" prop="修补操作时间" align="center" width="160px">
<template slot-scope="scope">
{{ scope.row.修补操作时间 || '—' }}
</template>
</el-table-column>
<el-table-column label="修补人" prop="修补人" align="center" width="100px">
<template slot-scope="scope">
{{ scope.row.修补人 || '—' }}
</template>
</el-table-column>
</el-table>
<div class="block">
<el-pagination
@@ -112,6 +91,7 @@ export default {
name: 'ActualTimeSupplement',
data() {
return {
isShow: false,
startTime: getNowShotTime(),
workerName: '',
loading: false,
@@ -130,20 +110,18 @@ export default {
this.searchTable()
},
methods: {
// 查询加工工时统计表
// 查询table
searchTable() {
this.loading = true
let check1, check2
this.startTime ? check1 = 1 : check1 = 0
this.workerName ? check2 = 1 : check2 = 0
searchTable(check1, this.startTime, check2, this.workerName, this.pageCurrent, this.pageSize).then(res => {
res.data.rows.map(v => {
v.实际加工时间段 = parseFloat(v.实际加工时间段).toFixed(2)
})
this.tableData = res.data.rows
this.total = res.data.total
this.tableData.map(v => {
this.$set(v, 'isEditing', false)
v.原修补工时 = v.修补工时
return v
})
this.loading = false
})
},

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

@@ -22,7 +22,7 @@
</el-tooltip>
</el-card>
<el-card>
<el-table v-loading="loading" :data="tableData" height="700" size="mini" stripe style="width: 800px" border element-loading-text="拼命加载中">
<el-table v-loading="loading" :data="tableData" size="mini" stripe style="width: 700px" border element-loading-text="拼命加载中">
<el-table-column label="操作者" align="center" width="110px">
<template slot-scope="scope">
{{ scope.row.姓名 }}