This commit is contained in:
chenjianan
2019-05-31 13:51:46 +08:00
parent 5b2e80677f
commit c39dcf2fd1
2 changed files with 10 additions and 11 deletions

View File

@@ -50,7 +50,7 @@ export function searchTable(check, entryNameValue, check1, machine, check2, grou
method: 'post',
data: {
type: '1',
name: '车间生产管理工艺_零件工艺计划_查询数据_状态_新_MESWORK',
name: '车间生产管理工艺_零件工艺计划_零件状态_查询数据',
param: '项目流水号_check=' + check + '=int&项目流水号=' + entryNameValue + '&机床流水号_check=' + check1 + '=int&机床流水号=' + machine + '=int&组件流水号_check=' + check2 + '=int&组件流水号=' + groupNum + '=int&零件图号_check=' + check3 + '=int&零件图号=' + partNumber + '=string&考核状态_check=' + check4 + '=int&考核状态=' + partStateValue + '=int&单件是否外协_check=' + check5 + '=int&单件是否外协=' + partTypeValue + '=int',
pagination: pageCurrent + '&' + pageSize
}

View File

@@ -83,15 +83,16 @@
</el-table-column>
<el-table-column align="center" label="投产时间" width="100px">
<template slot-scope="scope">
{{ scope.row.传递时间 }}
{{ scope.row.传递时间 ? scope.row.传递时间 : '—' }}
</template>
</el-table-column>
<el-table-column align="center" label="零件状态" min-width="960px">
<template slot-scope="scope">
<el-steps id="StatusQuery" :active="scope.row.考核状态" finish-status="success" simple>
<el-steps id="StatusQuery" :active="scope.row.零件状态" finish-status="success" simple>
<el-step title="分配" />
<el-step title="投产" />
<el-step title="工艺定额" />
<!--<el-step title="定额" />-->
<el-step title="工艺" />
<el-step title="定额" />
<el-step title="平衡" />
<el-step title="完成" />
<el-step title="入库" />
@@ -351,12 +352,10 @@ export default {
}
this.loading0 = true
searchTable(this.check, this.entryNameValue, this.check1, this.machine, this.check2, this.groupNum, this.check3, this.partNumber, this.check4, this.partStateValue, this.check5, this.partTypeValue, this.pageSize, this.pageCurrent).then(response => {
for (let i = 0; i < response.data.rows.length; i++) {
response.data.rows[i].考核状态 = parseInt(response.data.rows[i].考核状态) - 2
if (response.data.rows[i].传递时间 !== undefined || response.data.rows[i].hasOwnProperty('传递时间')) {
response.data.rows[i].传递时间 = response.data.rows[i].传递时间.split(' ', 2)[0]
}
}
response.data.rows.map(v => {
this.$set(v, '零件状态码', v.考核状态 ? parseInt(v.考核状态) - 2 : 0)
v.传递时间 = v.传递时间.split(' ')[0]
})
this.loading0 = false
this.tableData = response.data.rows
this.total = parseInt(response.data.total)