FT/foton-laws-system-front
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
fanlin
2021-07-20 18:00:09 +08:00
parent e69f39f4f0 b879288e24
commit 28a889fc2f
10 changed files with 112 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/standInvolveProjectDetail.vue
+42 -6
View File
@@ -142,80 +142,116 @@
align="center">
</el-table-column>
<el-table-column
width="150px"
align="center"
prop="productLineId"
label="产品线">
</el-table-column>
<el-table-column
width="150px"
align="center"
prop="standNumber"
label="项目编号">
</el-table-column>
<el-table-column
width="150px"
align="center"
prop="productName"
label="项目名称">
</el-table-column>
<el-table-column
width="150px"
align="center"
prop="standNumber"
label="标准编号">
</el-table-column>
<el-table-column
width="150px"
align="center"
prop="standName"
label="标准名称">
</el-table-column>
<el-table-column
width="150px"
align="center"
prop="standardItem"
label="标准章条">
label="条款号">
</el-table-column>
<el-table-column
width="150px"
align="center"
prop="standardInfo"
label="标准主要内容">
label="条款名称">
</el-table-column>
<el-table-column
align="productType"
align="center"
prop="productType"
label="在研产品">
<el-table-column
width="150px"
align="center"
prop="researchImplementationTime"
label="实施时间">
</el-table-column>
<el-table-column
width="150px"
align="center"
prop="researchCompliance"
label="合规">
</el-table-column>
<el-table-column
align="researchNonCompliance"
width="150px"
align="center"
label="不合规">
<el-table-column
width="150px"
align="center"
prop="researchNonCompliance"
label="不合规项目">
</el-table-column>
<el-table-column
width="150px"
align="center"
prop="researchCountermeasures"
label="应对措施">
</el-table-column>
<el-table-column
width="150px"
align="center"
prop="researchCompletionTime"
label="完成时间">
</el-table-column>
</el-table-column>
</el-table-column>
<el-table-column
align="center"
align="center"
prop="center"
label="在产产品">
<el-table-column
width="150px"
align="center"
prop="productionImplementationTime"
label="实施时间">
</el-table-column>
<el-table-column
width="150px"
align="center"
prop="productionCompliance"
label="合规(具体情况)">
</el-table-column>
<el-table-column
align="center"
width="150px"
align="center"
label="不合规">
<el-table-column
width="150px"
align="center"
prop="productionCountermeasures"
label="应对措施">
</el-table-column>
<el-table-column
width="150px"
align="center"
prop="productionCompletionTime"
label="完成时间">
</el-table-column>
src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue
+3 -3
View File
@@ -167,17 +167,17 @@
label="责任部门">
</el-table-column>
<el-table-column
prop="dutyEngineer"
prop="dutyEngineerName"
width="150"
label="责任工程师">
</el-table-column>
<el-table-column
prop="authEngineer"
prop="authEngineerName"
width="150"
label="认证工程师">
</el-table-column>
<el-table-column
prop="qaEngineer"
prop="qaEngineerName"
width="150"
label="质量工程师">
</el-table-column>