Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web
This commit is contained in:
commit
08b5c0550f
|
@ -175,6 +175,14 @@
|
|||
<template #default>
|
||||
<scTable ref="wprTable" :data="wprList">
|
||||
<el-table-column label="产品编号" prop="number"></el-table-column>
|
||||
<el-table-column label="记录数据" prop="oinfo">
|
||||
<template #default="scope">
|
||||
<div v-for="(item,index) in scope.row.oinfo" :key="item.id">
|
||||
{{ item.name }}:{{ item.val}}
|
||||
<span v-if="index<(scope.row.oinfo.length-1)">,</span>
|
||||
</div>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="缺陷项">
|
||||
<template #default="scope">
|
||||
<span v-for="item in scope.row.wprdefect" :key="item.id">
|
||||
|
|
|
@ -244,6 +244,7 @@ export default {
|
|||
res.qct_testitems.forEach((item2) => {
|
||||
let obj2 = Object.assign({}, item2);
|
||||
obj2.value = '';
|
||||
obj2.addto_wpr = item2.addto_wpr;
|
||||
if(item2.testitem_field_type=='input-number'||item2.testitem_field_type=='input-int'){
|
||||
obj2.value = 0;
|
||||
that.addTemplate[item2.testitem_name] = 0;
|
||||
|
@ -357,6 +358,7 @@ export default {
|
|||
let itemObj1 = {};
|
||||
itemObj1.testitem = item1.testitem;
|
||||
itemObj1.test_user = that.handle_user;
|
||||
itemObj1.addto_wpr = item1.addto_wpr;
|
||||
itemObj1.test_val_json = row[item1.testitem_name];
|
||||
obj.ftest.ftestitems.push(itemObj1);
|
||||
})
|
||||
|
|
Loading…
Reference in New Issue