Merge remote-tracking branch 'origin/develop' into develop

This commit is contained in:
yanyizhou
2021-10-14 15:53:12 +08:00
11 changed files with 227 additions and 102 deletions
@@ -64,6 +64,7 @@
height="100%"
border
style="width: 100%"
:default-sort = "{prop: 'partCode', order: 'ascending'}"
:header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
fontWeight: 'bold', height: '48px'}">
<el-table-column