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:
yanyizhou
2021-11-10 15:13:27 +08:00
parent e6c15f537f c57c3f40c1
commit 9ebab4d340
4 changed files with 17 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pages/details/otherBussStandardDetails/index.vue
+4 -4
View File
@@ -53,13 +53,13 @@
title="下载"
@click="downloadFile(file.id)"
class="icon-download"
v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? 'd5b28957b5105c805e90a16fd5056a45' : 'a772afab2a6708883335500f3f86e771'"
v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? 'd5b28957b5105c805e90a16fd5056a45' : '9882f477aad895ec56a7464f3e9c0b11'"
/>
<i
title="下载带水印"
@click="downloadFileByWater(file.id, file.fileSuffix)"
class="icon-download2"
v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? '02fd6eff0537c283dd071683de10689f' : '824f3bf9edef83fc7488917136167232'"
v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? '02fd6eff0537c283dd071683de10689f' : '9bab2662fbd9d0507b39be813371a597'"
/>
<!-- <span class="time-text">上传时间：{{ dateFormat(file.modifyTime) }}</span>-->
</span>
@@ -599,13 +599,13 @@
title="下载"
@click="downloadFile(file.id)"
class="icon-download"
v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? 'd5b28957b5105c805e90a16fd5056a45' : 'a772afab2a6708883335500f3f86e771'"
v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? 'd5b28957b5105c805e90a16fd5056a45' : '9882f477aad895ec56a7464f3e9c0b11'"
/>
<i
title="下载带水印"
@click="downloadFileByWater(file.id, file.fileSuffix)"
class="icon-download2"
v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? '02fd6eff0537c283dd071683de10689f' : '824f3bf9edef83fc7488917136167232'"
v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? '02fd6eff0537c283dd071683de10689f' : '9bab2662fbd9d0507b39be813371a597'"
/>
<div v-if="relateNowList.length >1">
<el-divider></el-divider>
src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue
+5 -3
View File
@@ -311,6 +311,7 @@
show-overflow-tooltip
prop="standName"
label="中文名称"
width="200"
>
<template slot-scope="scope">
<a v-if="scope.row.standStatusShow === '作废'" style="color: #F56C6C" @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standName }}</a>
@@ -322,6 +323,7 @@
show-overflow-tooltip
prop="standEnName"
label="英文名称"
width="200"
>
<template slot-scope="scope">
<a v-if="scope.row.standStatusShow === '作废'" style="color: #F56C6C" @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standEnName }}</a>
@@ -333,7 +335,7 @@
prop="issueTime"
label="发布日期"
sortable
width="110"
width="150"
>
<template slot-scope="scope">
<span v-if="scope.row.standStatusShow === '作废'" style="color: #F56C6C">{{scope.row.issueTime ? scope.row.issueTime.slice(0, 10) : ''}}</span>
@@ -345,7 +347,7 @@
prop="putTime"
label="实施日期"
sortable
width="110"
width="150"
>
<template slot-scope="scope">
<span v-if="scope.row.standStatusShow === '作废'" style="color: #F56C6C">{{scope.row.putTime ? scope.row.putTime.slice(0, 10) : ''}}</span>
@@ -358,7 +360,7 @@
sortable
prop="standStatusShow"
label="文本状态"
width="110"
width="120"
>
<template slot-scope="scope">
src/pages/regulatoryRepository/foreignRegulationsDatabase/index.vue
+5 -3
View File
@@ -210,6 +210,7 @@
show-overflow-tooltip
prop="lawsName"
label="中文名称"
width="200"
>
<template slot-scope="scope">
<a v-if="scope.row.standStatusShow === '作废'" style="color: #F56C6C" @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.lawsName }}</a>
@@ -221,6 +222,7 @@
show-overflow-tooltip
prop="lawsEnName"
label="英文名称"
width="200"
>
<template slot-scope="scope">
<a v-if="scope.row.standStatusShow === '作废'" style="color: #F56C6C" @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.lawsEnName }}</a>
@@ -232,7 +234,7 @@
prop="issueTime"
label="发文日期"
sortable
width="110"
width="150"
>
<template slot-scope="scope">
<span v-if="scope.row.standStatusShow === '作废'" style="color: #F56C6C">{{scope.row.issueTime ? scope.row.issueTime.slice(0, 10) : ''}}</span>
@@ -244,7 +246,7 @@
prop="XCXSSRQLAWS"
label="新车实施日期"
sortable
width="130"
width="150"
>
<template slot-scope="scope">
<span v-if="scope.row.standStatusShow === '作废'" style="color: #F56C6C">{{scope.row.putTime ? scope.row.putTime.slice(0, 10) : ''}}</span>
@@ -257,7 +259,7 @@
sortable
prop="standStatusShow"
label="文本状态"
width="110"
width="120"
>
<template slot-scope="scope">
src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue
+3 -2
View File
@@ -210,6 +210,7 @@
show-overflow-tooltip
prop="standName"
label="标准名称"
width="200"
>
<template slot-scope="scope">
<a v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" style="color: #F56C6C" @click="handlePreview(scope.row)" class="table-jump">{{
@@ -226,7 +227,7 @@
<el-table-column
prop="issueTime"
sortable="custom"
width="110px"
width="150px"
label="发布日期">
<template slot-scope="scope">
<div v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" style="color: #F56C6C">
@@ -243,7 +244,7 @@
<el-table-column
prop="SSRQ"
sortable="custom"
width="110px"
width="150px"
label="实施日期">
<template slot-scope="scope">
<!-- {{ formatIssueDate(scope.row.putTime) }}-->