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 16:26:12 +08:00
parent 46f828b435 0d92562260
commit 17a1645235
4 changed files with 36 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
+9 -9
View File
@@ -8,7 +8,7 @@
v-model="filterText">
</el-input>
<div class="tree">
<el-card style="height: 100%;padding-right: 120px;">
<el-card style="height: 100%;padding-right: 120px;overflow-y:auto">
<el-tree
ref="tree"
node-key="id"
@@ -191,7 +191,7 @@
</el-table-column>
<el-table-column
label="标准号"
width="200"
width="130"
>
<template slot-scope="scope">
<a v-if="scope.row.standYear && textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" class="table-jump" style="color: #F56C6C"
@@ -211,7 +211,7 @@
show-overflow-tooltip
prop="standName"
label="标准名称"
width="200"
width="350"
>
<template slot-scope="scope">
<a v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" @click="handlePreview(scope.row)" class="table-jump" style="color: #F56C6C">{{ scope.row.standName }}</a>
@@ -221,7 +221,7 @@
<el-table-column
prop="issueTime"
sortable="custom"
width="150px"
width="91px"
label="发布日期">
<template slot-scope="scope">
<span v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" style="color: #F56C6C">{{ formatIssueDate(scope.row.issueTime) }}</span>
@@ -231,7 +231,7 @@
<el-table-column
prop="SSRQ"
sortable="custom"
width="150px"
width="91px"
label="实施日期">
<template slot-scope="scope">
<!-- {{ formatIssueDate(scope.row.putTime) }}-->
@@ -244,7 +244,7 @@
<el-table-column
prop="XCXSSRQ"
sortable="custom"
width="150px"
width="91px"
label="新车型实施日期">
<template slot-scope="scope">
<span v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" style="color: #F56C6C">{{ scope.row.XCXSSRQ ? scope.row.XCXSSRQ.substring(0, 10) : '-' }}</span>
@@ -254,7 +254,7 @@
<el-table-column
prop="ZCCSSRQ"
sortable="custom"
width="150px"
width="91px"
label="在产车实施日期">
<template slot-scope="scope">
<span v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" style="color: #F56C6C">{{ scope.row.ZCCSSRQ ? scope.row.ZCCSSRQ.substring(0, 10) : '-' }}</span>
@@ -264,7 +264,7 @@
<el-table-column
prop="textStatus"
sortable="custom"
width="120px"
width="75px"
label="文本状态">
<!-- <template slot="header" slot-scope="scope">-->
<!-- <el-tooltip class="item" effect="dark" content="计划修订”、“修订中”均为现行有效版本；“已修订”标准的有效性根据实际实施情况判定。" placement="bottom">-->
@@ -278,7 +278,7 @@
<span v-else>{{ textStatusMap[scope.row.textStatus] }}</span>
</template>
</el-table-column>
<el-table-column v-if="isPermission('cac1eb379eb8e3b987cbb2e4599adb50,247cebaefa7cf1683092af160af11502,dbaf9df2990a595c8abea28e68b1a681')>0" label="操作" align="center" width="100">
<el-table-column v-if="isPermission('cac1eb379eb8e3b987cbb2e4599adb50,247cebaefa7cf1683092af160af11502,dbaf9df2990a595c8abea28e68b1a681')>0" label="操作" align="center" width="75">
<template slot-scope="scope">
<div v-if="isPermission('cac1eb379eb8e3b987cbb2e4599adb50,247cebaefa7cf1683092af160af11502,dbaf9df2990a595c8abea28e68b1a681') == 1"
@command="handleCommand"
src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue
+8 -8
View File
@@ -9,7 +9,7 @@
v-model="filterText">
</el-input>
<div class="tree">
<el-card style="height: 100%;padding-right: 120px;">
<el-card style="height: 100%;padding-right: 120px;overflow-y:auto">
<el-tree
@@ -298,7 +298,7 @@
<el-table-column
show-overflow-tooltip
label="企标编号"
width="200"
width="130"
>
<template slot-scope="scope">
<!-- <a v-if="scope.row.standYear" class="table-jump" @click="handlePreview(scope.row)">{{ scope.row.standSortShow }} {{ scope.row.standNumber }}-{{ scope.row.standYear }}</a>-->
@@ -311,7 +311,7 @@
show-overflow-tooltip
prop="standName"
label="中文名称"
width="200"
width="350"
>
<template slot-scope="scope">
<a v-if="scope.row.standStatusShow === '作废'" style="color: #F56C6C" @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standName }}</a>
@@ -323,7 +323,7 @@
show-overflow-tooltip
prop="standEnName"
label="英文名称"
width="200"
width="350"
>
<template slot-scope="scope">
<a v-if="scope.row.standStatusShow === '作废'" style="color: #F56C6C" @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standEnName }}</a>
@@ -335,7 +335,7 @@
prop="issueTime"
label="发布日期"
sortable
width="150"
width="91"
>
<template slot-scope="scope">
<span v-if="scope.row.standStatusShow === '作废'" style="color: #F56C6C">{{scope.row.issueTime ? scope.row.issueTime.slice(0, 10) : ''}}</span>
@@ -347,7 +347,7 @@
prop="putTime"
label="实施日期"
sortable
width="150"
width="91"
>
<template slot-scope="scope">
<span v-if="scope.row.standStatusShow === '作废'" style="color: #F56C6C">{{scope.row.putTime ? scope.row.putTime.slice(0, 10) : ''}}</span>
@@ -360,7 +360,7 @@
sortable
prop="standStatusShow"
label="文本状态"
width="120"
width="75"
>
<template slot-scope="scope">
@@ -376,7 +376,7 @@
</template>
</el-table-column>
<el-table-column v-if="isPermission('d9730d984627af948053df56a2db7997,dd4ea796dab7a01b105ba657b1968a84,a7a38a95ea374695fc3128037f6feccf')>0" label="操作" align="center" width="100">
<el-table-column v-if="isPermission('d9730d984627af948053df56a2db7997,dd4ea796dab7a01b105ba657b1968a84,a7a38a95ea374695fc3128037f6feccf')>0" label="操作" align="center" width="75">
<template slot-scope="scope">
<div v-if="isPermission('d9730d984627af948053df56a2db7997,dd4ea796dab7a01b105ba657b1968a84,a7a38a95ea374695fc3128037f6feccf') == 1"
@command="handleCommand"
src/pages/regulatoryRepository/foreignRegulationsDatabase/index.vue
+8 -8
View File
@@ -9,7 +9,7 @@
v-model="filterText">
</el-input>
<div class="tree">
<el-card style="height: 100%;padding-right: 120px;">
<el-card style="height: 100%;padding-right: 120px;overflow-y:auto">
<el-tree
ref="tree"
node-key="id"
@@ -197,7 +197,7 @@
<el-table-column
show-overflow-tooltip
label="政策编号"
width="200"
width="130"
>
<template slot-scope="scope">
<!-- <a v-if="scope.row.standYear" class="table-jump" @click="handlePreview(scope.row)">{{ scope.row.standSortShow }} {{ scope.row.standNumber }}-{{ scope.row.standYear }}</a>-->
@@ -210,7 +210,7 @@
show-overflow-tooltip
prop="lawsName"
label="中文名称"
width="200"
width="350"
>
<template slot-scope="scope">
<a v-if="scope.row.standStatusShow === '作废'" style="color: #F56C6C" @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.lawsName }}</a>
@@ -222,7 +222,7 @@
show-overflow-tooltip
prop="lawsEnName"
label="英文名称"
width="200"
width="350"
>
<template slot-scope="scope">
<a v-if="scope.row.standStatusShow === '作废'" style="color: #F56C6C" @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.lawsEnName }}</a>
@@ -234,7 +234,7 @@
prop="issueTime"
label="发文日期"
sortable
width="150"
width="91"
>
<template slot-scope="scope">
<span v-if="scope.row.standStatusShow === '作废'" style="color: #F56C6C">{{scope.row.issueTime ? scope.row.issueTime.slice(0, 10) : ''}}</span>
@@ -246,7 +246,7 @@
prop="XCXSSRQLAWS"
label="新车实施日期"
sortable
width="150"
width="91"
>
<template slot-scope="scope">
<span v-if="scope.row.standStatusShow === '作废'" style="color: #F56C6C">{{scope.row.putTime ? scope.row.putTime.slice(0, 10) : ''}}</span>
@@ -259,7 +259,7 @@
sortable
prop="standStatusShow"
label="文本状态"
width="120"
width="75"
>
<template slot-scope="scope">
@@ -276,7 +276,7 @@
</el-table-column>
<el-table-column v-if="isPermission('fd83032ae5f41a0021b00e93c88edbbo,fd83032ae5f41a0021b00e93c88edbbr,fd83032ae5f41a0021b00e93c88edbbk')>0" label="操作" align="center" width="100">
<el-table-column v-if="isPermission('fd83032ae5f41a0021b00e93c88edbbo,fd83032ae5f41a0021b00e93c88edbbr,fd83032ae5f41a0021b00e93c88edbbk')>0" label="操作" align="center" width="75">
<template slot-scope="scope">
<div v-if="isPermission('fd83032ae5f41a0021b00e93c88edbbo,fd83032ae5f41a0021b00e93c88edbbr,fd83032ae5f41a0021b00e93c88edbbk') == 1"
src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue
+11 -11
View File
@@ -8,7 +8,7 @@
v-model="filterText">
</el-input>
<div class="tree">
<el-card style="height: 100%;padding-right: 120px;">
<el-card style="height: 100%;padding-right: 120px;overflow-y:auto">
<el-tree
ref="tree"
@@ -112,8 +112,8 @@
v-btn-permission="'31ac9f600d8a3072ba088f1c106df359'"
@click="clearAllSearch('standCommonlySearch')">清空
</el-button>
<el-button type="primary" class="common-button-primary" size="mini" @click="selectMoreBtn">
<i class="iconfont" v-btn-permission="'cce80ba303858ee9943f17e93946c2ff'">&#xe7a5;</i>高级查询
<el-button type="primary" class="common-button-primary" size="mini" v-btn-permission="'cce80ba303858ee9943f17e93946c2ff'" @click="selectMoreBtn">
<i class="iconfont" >&#xe7a5;</i>高级查询
</el-button>
</el-form-item>
</el-form>
@@ -188,7 +188,7 @@
</el-table-column>
<el-table-column
label="标准号"
width="200"
width="130"
>
<template slot-scope="scope">
<a v-if="scope.row.standYear && textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" style="color: #F56C6C" class="table-jump" @click="handlePreview(scope.row)">{{
@@ -210,7 +210,7 @@
show-overflow-tooltip
prop="standName"
label="标准名称"
width="200"
width="350"
>
<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">{{
@@ -227,7 +227,7 @@
<el-table-column
prop="issueTime"
sortable="custom"
width="150px"
width="91px"
label="发布日期">
<template slot-scope="scope">
<div v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" style="color: #F56C6C">
@@ -244,7 +244,7 @@
<el-table-column
prop="SSRQ"
sortable="custom"
width="150px"
width="91px"
label="实施日期">
<template slot-scope="scope">
<!-- {{ formatIssueDate(scope.row.putTime) }}-->
@@ -261,7 +261,7 @@
<el-table-column
prop="XCXSSRQ"
sortable="custom"
width="150px"
width="91px"
label="新车型实施日期">
<template slot-scope="scope">
<span v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" style="color: #F56C6C">{{
@@ -278,7 +278,7 @@
<el-table-column
prop="ZCCSSRQ"
sortable="custom"
width="150px"
width="91px"
label="在产车实施日期">
<template slot-scope="scope">
<span v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" style="color: #F56C6C">{{
@@ -295,7 +295,7 @@
<el-table-column
prop="textStatus"
sortable="custom"
width="120px"
width="75px"
label="文本状态">
<!-- <template slot="header" slot-scope="scope">-->
<!-- <el-tooltip class="item" effect="dark" content="计划修订”、“修订中”均为现行有效版本；“已修订”标准的有效性根据实际实施情况判定。" placement="bottom">-->
@@ -312,7 +312,7 @@
<span v-else style="color: #333333">{{ textStatusMap[scope.row.textStatus] }}</span>
</template>
</el-table-column>
<el-table-column v-if="isPermission('f9745194958bc9ed3ee5127459795dbc,e8d690904ee1895dd0d17d9c794fbcd7,b299fa5edb3f3f35badb2adb6bda9f2e')>0" label="操作" align="center" width="100">
<el-table-column v-if="isPermission('f9745194958bc9ed3ee5127459795dbc,e8d690904ee1895dd0d17d9c794fbcd7,b299fa5edb3f3f35badb2adb6bda9f2e')>0" label="操作" align="center" width="75">
<template slot-scope="scope">
<div v-if="isPermission('f9745194958bc9ed3ee5127459795dbc,e8d690904ee1895dd0d17d9c794fbcd7,b299fa5edb3f3f35badb2adb6bda9f2e') == 1"