Merge remote-tracking branch 'origin/develop' into develop
This commit is contained in:
@@ -88,11 +88,11 @@ export default {
|
||||
path: '/domesticStandardsAndRegulations',
|
||||
menuId: '3e3657498664beaa0dc1de1ecb3ae0da'
|
||||
},
|
||||
{
|
||||
title: '零部件编号申请',
|
||||
path: '/partCodeApply',
|
||||
menuId: ''
|
||||
},
|
||||
// {
|
||||
// title: '零部件编号申请',
|
||||
// path: '/partCodeApply',
|
||||
// menuId: ''
|
||||
// },
|
||||
{
|
||||
title: '标准法规工作组数据统计',
|
||||
path: '/dataStatisComments',
|
||||
|
||||
@@ -117,7 +117,7 @@
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
label="责任人"
|
||||
label="落实人"
|
||||
width="170"
|
||||
align="center">
|
||||
<template slot-scope="scope">
|
||||
|
||||
@@ -333,7 +333,6 @@ export default {
|
||||
this.listForm["id"] = item.id;
|
||||
this.listForm.dataList = item.dataList;
|
||||
this.dataList = item.dataList;
|
||||
console.log(this.dataList);
|
||||
// this.dataList.standNumber = item.dataList.standSort + '\xa0\xa0' +item.dataList.standSort + '-' + item.dataList.standYear
|
||||
let children = [];
|
||||
item.breakdownList.forEach(
|
||||
|
||||
@@ -50,6 +50,7 @@
|
||||
<div class="table_area">
|
||||
<div class="container">
|
||||
<loading :loading="loading"></loading>
|
||||
<!--表头-->
|
||||
<div class="table-wrap">
|
||||
<div class="inner-wrap">
|
||||
<el-table>
|
||||
@@ -62,9 +63,11 @@
|
||||
<el-table-column label="零部件分类名称"></el-table-column>
|
||||
<el-table-column label="零部件分类代号"></el-table-column>
|
||||
<el-table-column label="备注"></el-table-column>
|
||||
<el-table-column label="操作"></el-table-column>
|
||||
</el-table>
|
||||
</div>
|
||||
</div>
|
||||
<!--表头-->
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
Reference in New Issue
Block a user