Merge remote-tracking branch 'origin/develop' into develop
This commit is contained in:
@@ -200,8 +200,8 @@
|
|||||||
|
|
||||||
</template>
|
</template>
|
||||||
<template
|
<template
|
||||||
v-for="(child, childIndex) in item.one"
|
v-for="(child, childIndex) in item.child"
|
||||||
v-if="child.isShowImp === '0' && (item.label !== '关联信息' && (item.label !== '实施日期' && child.attrField !== 'SSRQGJ' && child.attrField !== 'ZCCSSRQGJ' && child.attrField !== 'XCXSSRQGJ' || (childIndex < 6 || item.showAll)) || item.label === '适用范围')"
|
v-if="child.isShowImp === '0' && item.label === '关联信息'"
|
||||||
>
|
>
|
||||||
<div
|
<div
|
||||||
:key="child.id"
|
:key="child.id"
|
||||||
@@ -294,8 +294,8 @@
|
|||||||
|
|
||||||
</template>
|
</template>
|
||||||
<template
|
<template
|
||||||
v-for="(child, childIndex) in item.child"
|
v-for="(child, childIndex) in item.one"
|
||||||
v-if="child.isShowImp === '0' && item.label !== '实施日期' && item.label !== '适用范围'"
|
v-if="child.isShowImp === '0' && item.label !== '关联信息' && (item.label !== '实施日期' || (childIndex < 6 || item.showAll))"
|
||||||
>
|
>
|
||||||
<div
|
<div
|
||||||
:key="child.id"
|
:key="child.id"
|
||||||
|
|||||||
Reference in New Issue
Block a user