fix:入库记录有检验时添加检验提交状态
This commit is contained in:
parent
0f90a845d0
commit
e0fa44f976
|
|
@ -141,7 +141,13 @@
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column label="检验" prop="count_tested" v-if="cate=='mainso'">
|
<el-table-column label="检验" prop="count_tested" v-if="cate=='mainso'&&(type == 'pur_in' ||type == 'do_in' ||type == 'other_in')">
|
||||||
|
</el-table-column>
|
||||||
|
<el-table-column label="检验提交" prop="count_tested" v-if="cate=='mainso'&&(type == 'pur_in' ||type == 'do_in' ||type == 'other_in')">
|
||||||
|
<template #default="scope">
|
||||||
|
<el-tag v-if="scope.row.test_date == null" type="warning">否</el-tag>
|
||||||
|
<el-tag v-else type="success">是</el-tag>
|
||||||
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column label="不合格数量" prop="count_notok" v-if="cate!=='helpso'">
|
<el-table-column label="不合格数量" prop="count_notok" v-if="cate!=='helpso'">
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
|
|
@ -158,8 +164,7 @@
|
||||||
link
|
link
|
||||||
type="primary"
|
type="primary"
|
||||||
@click="table_check(scope.row)"
|
@click="table_check(scope.row)"
|
||||||
v-if="project_code=='bxerp'&&mioObj.state == 10 &&
|
v-if="project_code=='bxerp'&&mioObj.state == 10 &&(type == 'pur_in' ||type == 'do_in' ||type == 'other_in')"
|
||||||
(type == 'pur_in' ||type == 'do_in' ||type == 'other_in')"
|
|
||||||
v-auth="'mioitem.test'"
|
v-auth="'mioitem.test'"
|
||||||
>检验</el-button>
|
>检验</el-button>
|
||||||
<scFileImport
|
<scFileImport
|
||||||
|
|
@ -672,9 +677,9 @@ export default {
|
||||||
if((index == 6||index == 7||index == 8||index == 9)&&column.label=='不合格数量'){
|
if((index == 6||index == 7||index == 8||index == 9)&&column.label=='不合格数量'){
|
||||||
propert = 'count_notok';
|
propert = 'count_notok';
|
||||||
}
|
}
|
||||||
if((index == 6||index == 7||index == 8)&&column.label=='检验'){
|
// if((index == 6||index == 7||index == 8)&&column.label=='检验'){
|
||||||
propert = 'count_tested';
|
// propert = 'count_tested';
|
||||||
}
|
// }
|
||||||
if(index == 6 &&column.label == '发出数量'){
|
if(index == 6 &&column.label == '发出数量'){
|
||||||
propert = 'count_send';
|
propert = 'count_send';
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue