|
|
@@ -1003,22 +1003,6 @@
|
|
|
<div
|
|
|
v-if="!scope.row['interfacePushId'] && !scope.row['periodPlush']"
|
|
|
>
|
|
|
-<<<<<<< HEAD
|
|
|
-=======
|
|
|
- {{
|
|
|
- scope.row[item.prop] === 0
|
|
|
- ? "未通过"
|
|
|
- : scope.row[item.prop] === 1
|
|
|
- ? "已通过"
|
|
|
- : scope.row[item.prop] === 2
|
|
|
- ? "待审核"
|
|
|
- : scope.row[item.prop] === -1
|
|
|
- ? '不可审核'
|
|
|
- : ''
|
|
|
- }}
|
|
|
- </span>
|
|
|
- <div v-else-if="item.scope === 'changeCLS'">
|
|
|
->>>>>>> 68f569a0dbde51dfd318e8347a607fee3c2b0c28
|
|
|
<div v-if="scope.row[item.prop] === 1" style="color: red">
|
|
|
有变更<span
|
|
|
style="margin-left: 6px; color: blue; cursor: pointer"
|
|
|
@@ -2894,5 +2878,4 @@ export default {
|
|
|
max-height: 500px;
|
|
|
overflow-y: auto;
|
|
|
}
|
|
|
-</style>
|
|
|
-
|
|
|
+</style>
|
