Merge remote-tracking branch 'origin/develop' into develop
This commit is contained in:
@@ -212,6 +212,7 @@
|
|||||||
show-overflow-tooltip
|
show-overflow-tooltip
|
||||||
prop="standName"
|
prop="standName"
|
||||||
label="标准名称"
|
label="标准名称"
|
||||||
|
min-width="300"
|
||||||
>
|
>
|
||||||
<template slot-scope="scope">
|
<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>
|
<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>
|
||||||
|
|||||||
+2
@@ -314,6 +314,7 @@
|
|||||||
show-overflow-tooltip
|
show-overflow-tooltip
|
||||||
prop="standName"
|
prop="standName"
|
||||||
label="中文名称"
|
label="中文名称"
|
||||||
|
min-width="300"
|
||||||
>
|
>
|
||||||
<template slot-scope="scope">
|
<template slot-scope="scope">
|
||||||
<a v-if="scope.row.standStatusShow === '作废'" style="color: #F56C6C" @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standName }}</a>
|
<a v-if="scope.row.standStatusShow === '作废'" style="color: #F56C6C" @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standName }}</a>
|
||||||
@@ -325,6 +326,7 @@
|
|||||||
show-overflow-tooltip
|
show-overflow-tooltip
|
||||||
prop="standEnName"
|
prop="standEnName"
|
||||||
label="英文名称"
|
label="英文名称"
|
||||||
|
min-width="300"
|
||||||
>
|
>
|
||||||
<template slot-scope="scope">
|
<template slot-scope="scope">
|
||||||
<a v-if="scope.row.standStatusShow === '作废'" style="color: #F56C6C" @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standEnName }}</a>
|
<a v-if="scope.row.standStatusShow === '作废'" style="color: #F56C6C" @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standEnName }}</a>
|
||||||
|
|||||||
@@ -213,6 +213,7 @@
|
|||||||
show-overflow-tooltip
|
show-overflow-tooltip
|
||||||
prop="lawsName"
|
prop="lawsName"
|
||||||
label="中文名称"
|
label="中文名称"
|
||||||
|
min-width="300"
|
||||||
>
|
>
|
||||||
<template slot-scope="scope">
|
<template slot-scope="scope">
|
||||||
<a v-if="scope.row.standStatusShow === '作废'" style="color: #F56C6C" @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.lawsName }}</a>
|
<a v-if="scope.row.standStatusShow === '作废'" style="color: #F56C6C" @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.lawsName }}</a>
|
||||||
@@ -224,6 +225,7 @@
|
|||||||
show-overflow-tooltip
|
show-overflow-tooltip
|
||||||
prop="lawsEnName"
|
prop="lawsEnName"
|
||||||
label="英文名称"
|
label="英文名称"
|
||||||
|
min-width="300"
|
||||||
>
|
>
|
||||||
<template slot-scope="scope">
|
<template slot-scope="scope">
|
||||||
<a v-if="scope.row.standStatusShow === '作废'" style="color: #F56C6C" @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.lawsEnName }}</a>
|
<a v-if="scope.row.standStatusShow === '作废'" style="color: #F56C6C" @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.lawsEnName }}</a>
|
||||||
|
|||||||
@@ -211,6 +211,7 @@
|
|||||||
show-overflow-tooltip
|
show-overflow-tooltip
|
||||||
prop="standName"
|
prop="standName"
|
||||||
label="标准名称"
|
label="标准名称"
|
||||||
|
min-width="300"
|
||||||
>
|
>
|
||||||
<template slot-scope="scope">
|
<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">{{
|
<a v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" style="color: #F56C6C" @click="handlePreview(scope.row)" class="table-jump">{{
|
||||||
|
|||||||
Reference in New Issue
Block a user