fix:返工返修统一改为返工
This commit is contained in:
parent
165b859510
commit
aefc3c85fe
|
|
@ -203,8 +203,8 @@ export const schedulePeriodEnum = new EnumFactory({
|
||||||
export const wmState = new EnumFactory({
|
export const wmState = new EnumFactory({
|
||||||
10: { text: '合格', type: 'success' },
|
10: { text: '合格', type: 'success' },
|
||||||
20: { text: '不合格', type: 'warning' },
|
20: { text: '不合格', type: 'warning' },
|
||||||
30: { text: '返修', type: 'warning' },
|
30: { text: '返工', type: 'warning' },
|
||||||
34: { text: '返修完成', type: 'warning' },
|
34: { text: '返工完成', type: 'warning' },
|
||||||
40: { text: '检验', type: 'primary' },
|
40: { text: '检验', type: 'primary' },
|
||||||
50: { text: '报废', type: 'danger' },
|
50: { text: '报废', type: 'danger' },
|
||||||
}, parseInt)
|
}, parseInt)
|
||||||
|
|
|
||||||
|
|
@ -134,7 +134,7 @@ export default {
|
||||||
state_:{
|
state_:{
|
||||||
10:'合格',
|
10:'合格',
|
||||||
20:'不合格',
|
20:'不合格',
|
||||||
30:'返修',
|
30:'返工',
|
||||||
},
|
},
|
||||||
wprParams:{
|
wprParams:{
|
||||||
page:0
|
page:0
|
||||||
|
|
|
||||||
|
|
@ -335,7 +335,7 @@
|
||||||
<el-row v-else>
|
<el-row v-else>
|
||||||
<el-col><div>不合格</div></el-col>
|
<el-col><div>不合格</div></el-col>
|
||||||
<!-- <el-col :md="12" :sm="24">
|
<!-- <el-col :md="12" :sm="24">
|
||||||
<el-form-item label="返修">
|
<el-form-item label="返工">
|
||||||
<el-input-number
|
<el-input-number
|
||||||
controls-position="right"
|
controls-position="right"
|
||||||
v-model="count_notok_json.count_n_fx"
|
v-model="count_notok_json.count_n_fx"
|
||||||
|
|
|
||||||
|
|
@ -120,7 +120,7 @@
|
||||||
<el-table-column label="合计" prop="count_notok"></el-table-column>
|
<el-table-column label="合计" prop="count_notok"></el-table-column>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column label="不合格数" align="center" v-else>
|
<el-table-column label="不合格数" align="center" v-else>
|
||||||
<el-table-column label="返修">
|
<el-table-column label="返工">
|
||||||
<template #default="scope">
|
<template #default="scope">
|
||||||
{{ scope.row.count_notok_json.count_n_fx }}
|
{{ scope.row.count_notok_json.count_n_fx }}
|
||||||
</template>
|
</template>
|
||||||
|
|
|
||||||
|
|
@ -300,7 +300,7 @@ export default {
|
||||||
stateOptions:[
|
stateOptions:[
|
||||||
{ value: 10, name: "合格"},
|
{ value: 10, name: "合格"},
|
||||||
{ value: 20, name: "不合格"},
|
{ value: 20, name: "不合格"},
|
||||||
{ value: 30, name: "返修"},
|
{ value: 30, name: "返工"},
|
||||||
// { value: 40, name: "检验"},
|
// { value: 40, name: "检验"},
|
||||||
// { value: 50, name: "报废"},
|
// { value: 50, name: "报废"},
|
||||||
],
|
],
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue