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

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

Browse Source
This commit is contained in:
liulujia
2020-04-29 08:55:46 +08:00
parent c8ad9ec99d 8edf3ea21f
commit 11959d8ab9
22 changed files with 136 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -9,7 +9,7 @@
:label="item.label"
:value="item.value"/>
</el-select>
<span style="margin-left: 0">审核时间:</span>
<span style="margin-left: 0">提交时间:</span>
<el-date-picker
v-model="dateRange"
size="small"

15
src/views/ManufacturingCenter/DiscardedPartsInquiry/index.vue
View File

@@ -84,11 +84,26 @@
{{ scope.row.报废时间 }}
</template>
</el-table-column>
<el-table-column align="center" label="报废人" width="85px">
<template slot-scope="scope">
{{ scope.row.报废人 }}
</template>
</el-table-column>
<el-table-column align="center" label="报废工序" width="85px">
<template slot-scope="scope">
{{ scope.row.工艺名称 }}
</template>
</el-table-column>
<el-table-column align="center" label="报废原因" width="100px" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.报废原因 }}
</template>
</el-table-column>
<el-table-column align="center" label="操作工人" width="100px" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.操作工 === '超级管理员' ? '' : scope.row.操作工 }}
</template>
</el-table-column>
<el-table-column align="center" label="报废备注" width="140px" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.备注 }}

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

@@ -16,7 +16,7 @@
:label="item.label"
:value="item.value"/>
</el-select>
<span style="margin-left: 0">审核时间:</span>
<span style="margin-left: 0">提交时间:</span>
<el-date-picker
v-model="dateRange"
size="small"

23
src/views/ManufacturingCenter/ScrappedSupplementaryInvestment/index.vue
View File

@@ -46,6 +46,7 @@
style="width: 1390px; margin: 3px 0"
size="mini"
border
stripe
highlight-current-row
element-loading-text="拼命加载中"
@selection-change="handleSelectionChange">
@@ -106,16 +107,16 @@
{{ 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.不合格处理文本 }}
</template>
</el-table-column>
<!--<el-table-column label="责任人" align="center">-->
<!--<template slot-scope="scope">-->
<!--{{ scope.row.不合格处理文本 }}-->
<!--</template>-->
<!--</el-table-column>-->
<el-table-column label="操作人员" align="center">
<template slot-scope="scope">
{{ scope.row.操作工 === '超级管理员' ? '' : scope.row.操作工 }}
</template>
</el-table-column>
<el-table-column label="报废工时(分)" align="center" width="110">
<template slot-scope="scope">
{{ scope.row.报废工时 }}
@@ -203,7 +204,9 @@ export default {
pageSize: 30, // 每页显示条数
pageCurrent: 1, // 后台获取页
outTime: '',
order: ''
order: '',
operaPeople: [],
procedureGroup1: []
}
},
computed: {
@@ -293,15 +296,19 @@ export default {
this.Unqualified = []
this.remarkGroup = []
this.people = []
this.operaPeople = []
this.procedureGroup1 = []
for (let i = 0; i < this.procedureGroup.length; i++) {
this.ScrapQuantity.push(this.procedureGroup[i].不合格数量)
this.ProcessPlanNumber.push(this.procedureGroup[i].工艺计划流水号)
this.Unqualified.push(this.procedureGroup[i].不合格原因文本)
this.remarkGroup.push(this.procedureGroup[i].备注)
this.people.push(this.procedureGroup[i].人员编号)
this.operaPeople.push(this.procedureGroup[i].操作人员编号)
this.procedureGroup1.push(this.procedureGroup[i].工序流水号)
}
this.handleEdit_disable = true
editSpare(this.ProcessPlanNumber, this.ScrapQuantity, this.id, this.Unqualified, this.remarkGroup, this.people).then(response => {
editSpare(this.ProcessPlanNumber, this.ScrapQuantity, this.id, this.Unqualified, this.remarkGroup, this.people, this.operaPeople, this.procedureGroup1).then(response => {
if (response.data[0].result === '1') {
this.$message.success('报废成功')
this.searchTable()