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-03-01 15:06:05 +08:00
parent 7674978c4f
commit f9b2c840f7
5 changed files with 71 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
src/views/ManufacturingCenter/MonthEndHourAccounting/index.vue
View File

@@ -12,6 +12,8 @@
style="width:250px;margin-left: 5px;margin-top: 10px;margin-bottom: 10px"
start-placeholder="开始日期"
end-placeholder="结束日期"/>
<el-input v-model="name" size="small" placeholder="操作工" style="width: 150px" clearable/>
<el-input v-model="partNumber" size="small" placeholder="零件图号" style="width: 150px" clearable/>
<el-button size="small" type="primary" icon="el-icon-search" style="margin-left: 5px" plain @click="pageCurrent=1;pageSize=50;searchTable()">查询</el-button>
<el-button size="small" type="primary" icon="el-icon-download" plain @click="exportExcel">导出</el-button>
</el-card>
@@ -19,12 +21,12 @@
<el-table v-loading="loading" :data="tableData" size="mini" style="max-height: 720px" height="720px" border @sort-change="sortChange">
<el-table-column align="center" label="姓名" width="80px" sortable="custom" prop="姓名">
<template slot-scope="scope">
{{ scope.row.姓名 }}
{{ scope.row.操作工 }}
</template>
</el-table-column>
<el-table-column align="center" label="图号" width="150px">
<template slot-scope="scope">
{{ scope.row.零件图号_零件工艺计划 }}
{{ scope.row.零件图号 }}
</template>
</el-table-column>
<el-table-column align="center" label="跟单号" width="120px">
@@ -42,24 +44,24 @@
{{ scope.row.工艺名称 }}
</template>
</el-table-column>
<el-table-column align="center" label="录入准结(分)" width="110px">
<template slot-scope="scope">
{{ scope.row.修补准结工时 }}
</template>
</el-table-column>
<el-table-column align="center" label="加工工时(分)" width="110px">
<template slot-scope="scope">
{{ scope.row.设备工时 }}
</template>
</el-table-column>
<!--<el-table-column align="center" label="录入准结(分)" width="110px">-->
<!--<template slot-scope="scope">-->
<!--{{ scope.row.修补准结工时 }}-->
<!--</template>-->
<!--</el-table-column>-->
<!--<el-table-column align="center" label="加工工时(分)" width="110px">-->
<!--<template slot-scope="scope">-->
<!--{{ scope.row.设备工时 }}-->
<!--</template>-->
<!--</el-table-column>-->
<el-table-column align="center" label="扫码工时(分)" width="110px">
<template slot-scope="scope">
{{ scope.row.扫码工时 }}
</template>
</el-table-column>
<el-table-column align="center" label="辅助工时(分)" width="110px">
<el-table-column align="center" label="完成工时(分)" width="110px">
<template slot-scope="scope">
{{ scope.row.辅助工时 }}
{{ scope.row.完成工时 }}
</template>
</el-table-column>
<el-table-column align="center" label="工时比值" width="100px">
@@ -67,19 +69,19 @@
{{ scope.row.工时比值 }}
</template>
</el-table-column>
<el-table-column align="center" label="合格件数" width="80px">
<el-table-column align="center" label="完成数量" width="80px">
<template slot-scope="scope">
{{ scope.row.合格数量 }}
</template>
</el-table-column>
<el-table-column align="center" label="废品件数" width="80px">
<template slot-scope="scope">
{{ scope.row.不合格数量 }}
{{ scope.row.完成数量 }}
</template>
</el-table-column>
<!--<el-table-column align="center" label="废品件数" width="80px">-->
<!--<template slot-scope="scope">-->
<!--{{ scope.row.不合格数量 }}-->
<!--</template>-->
<!--</el-table-column>-->
<el-table-column align="center" label="加工日期" width="110px" sortable="custom" prop="操作时间">
<template slot-scope="scope">
{{ scope.row.操作时间 }}
{{ scope.row.完成日期 }}
</template>
</el-table-column>
<el-table-column align="center" label="备注" width="200px" show-overflow-tooltip="">
@@ -150,6 +152,8 @@ export default {
orderName: 0,
order: 0,
startTime: '',
name: '',
partNumber: '',
tableData: [],
loading: false,
total: 0, // 总条数
@@ -186,8 +190,11 @@ export default {
},
searchTable() {
if (this.startTime[0] && this.startTime[1]) {
let check, check1
this.name ? check = 1 : check = 0
this.partNumber ? check1 = 1 : check1 = 0
this.loading = true
searchTable(this.startTime[0], this.startTime[1], this.orderName, this.order, this.pageCurrent, this.pageSize).then(response => {
searchTable(this.startTime[0], this.startTime[1], this.orderName, this.order, check, this.name, check1, this.partNumber, this.pageCurrent, this.pageSize).then(response => {
response.data.rows.map(v => {
this.$set(v, '工时比值', parseInt(v.计划工时) === 0 ? 0 : (Math.round(parseInt(v.扫码工时) / parseInt(v.计划工时) * 100) / 100.00))
})