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:
Superman_Main
2021-12-09 09:43:38 +08:00
parent e28c0de082 77d9aae34c
commit 16c2473b5c
2 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
+8 -8
View File
@@ -243,8 +243,8 @@
<template slot-scope="scope"> <template slot-scope="scope">
<span <span
v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'"
style="color: #F56C6C">{{ formatIssueDate(scope.row.issueTime) }}</span> style="color: #F56C6C">{{ scope.row.issueTime }}</span>
<span v-else>{{ formatIssueDate(scope.row.issueTime) }}</span> <span v-else>{{ scope.row.issueTime }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
@@ -256,8 +256,8 @@
<!-- {{ formatIssueDate(scope.row.putTime) }}--> <!-- {{ formatIssueDate(scope.row.putTime) }}-->
<span <span
v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'"
style="color: #F56C6C">{{ scope.row.SSRQ ? scope.row.SSRQ.substring(0, 10) : '-' }}</span> style="color: #F56C6C">{{ scope.row.SSRQ }}</span>
<span v-else>{{ scope.row.SSRQ ? scope.row.SSRQ.substring(0, 10) : '-' }}</span> <span v-else>{{ scope.row.SSRQ }}</span>
</template> </template>
</el-table-column> </el-table-column>
@@ -270,8 +270,8 @@
<template slot-scope="scope"> <template slot-scope="scope">
<span <span
v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'"
style="color: #F56C6C">{{ scope.row.XCXSSRQ ? scope.row.XCXSSRQ : '-' }}</span> style="color: #F56C6C">{{ scope.row.XCXSSRQ }}</span>
<span v-else>{{ scope.row.XCXSSRQ ? scope.row.XCXSSRQ : '-' }}</span> <span v-else>{{ scope.row.XCXSSRQ }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
@@ -282,8 +282,8 @@
<template slot-scope="scope"> <template slot-scope="scope">
<span <span
v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'"
style="color: #F56C6C">{{ scope.row.ZCCSSRQ ? scope.row.ZCCSSRQ : '-' }}</span> style="color: #F56C6C">{{ scope.row.ZCCSSRQ }}</span>
<span v-else>{{ scope.row.ZCCSSRQ ? scope.row.ZCCSSRQ : '-' }}</span> <span v-else>{{ scope.row.ZCCSSRQ }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/technologyInvolveProject.vue
+4 -3
View File
@@ -101,10 +101,11 @@
<el-table-column <el-table-column
fixed="right" fixed="right"
label="" label=""
width="50" width="100"
align="center"> align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<i class="el-icon-view btn-i" @click="handleProjectCompliance(scope.row)"></i> <el-button class="common-button-primary" type="primary" size="mini" @click="handleProjectCompliance(scope.row)">查看</el-button>
<!-- <i class="el-icon-view btn-i" @click="handleProjectCompliance(scope.row)"></i>-->
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
@@ -113,7 +114,7 @@
</div> </div>
<!-- 查看符合标准性弹窗--> <!-- 查看符合标准性弹窗-->
<el-drawer <el-drawer
title="标准涉及项目符合性" title="标准技术储备符合性"
:visible.sync="showSarProStateModal" :visible.sync="showSarProStateModal"
:wrapperClosable="false" :wrapperClosable="false"
size="1100px" size="1100px"