|
@@ -367,7 +367,7 @@
|
|
|
</div>
|
|
|
</div>
|
|
|
</div>
|
|
|
- <div class="border" v-if="['2','3','4','8'].indexOf(row.statutesId) !=-1">
|
|
|
+ <div class="border" v-if="['2','3','4','8'].indexOf(row.statutesId) !=-1 && !item.noFirst">
|
|
|
<div class="top">无效证据</div>
|
|
|
<div class="content" v-for="(literature,i) in item.evidenceList" :key="'literatures'+i">
|
|
|
<div class="content content_item">
|
|
@@ -569,7 +569,7 @@
|
|
|
</div>
|
|
|
|
|
|
|
|
|
- <div class="content">
|
|
|
+ <div class="content" v-if="!item.noFirst">
|
|
|
<div>
|
|
|
<div class="left">
|
|
|
无效理由详情
|
|
@@ -583,7 +583,7 @@
|
|
|
</div>
|
|
|
</div>
|
|
|
</div>
|
|
|
- <div v-if="['2','3','4','8'].indexOf(row.statutesId) ==-1">
|
|
|
+ <div v-if="['2','3','4','8'].indexOf(row.statutesId) ==-1 || (item.featureGen == 1 && item.featureOperateMode == 2)">
|
|
|
<div class="left">答辩意见陈述情况</div>
|
|
|
<div class="right">
|
|
|
<div v-if="edit">
|
|
@@ -831,7 +831,7 @@
|
|
|
</div>
|
|
|
</div>
|
|
|
</div>
|
|
|
- <div v-if="['2','3','4','8'].indexOf(row.statutesId) ==-1">
|
|
|
+ <div v-if="['2','3','4','8'].indexOf(row.statutesId) ==-1 || (item.featureGen == 2 && item.featureOperateMode == 2)">
|
|
|
<div class="left">第二次答辩意见陈述情况</div>
|
|
|
<div class="right">
|
|
|
<div v-if="edit">
|
|
@@ -863,7 +863,7 @@
|
|
|
</div>
|
|
|
</template>
|
|
|
<div class="content" >
|
|
|
- <div style="border-top:none !important;" v-if="['2','3','4','8'].indexOf(row.statutesId) ==-1">
|
|
|
+ <div style="border-top:none !important;" v-if="['2','3','4','8'].indexOf(row.statutesId) ==-1 || ( item.featureOperateMode == 2)">
|
|
|
<div class="left">复审委意见结论</div>
|
|
|
<div class="right">
|
|
|
<div v-if="edit">
|
|
@@ -1302,8 +1302,19 @@ export default {
|
|
|
var secondEvidenceReason1 = secondEvidenceReason.status == "fulfilled"?secondEvidenceReason.value:[]
|
|
|
var obj = this.freightData(FirstEvidenceReason1)
|
|
|
var obj2 = this.freightData(secondEvidenceReason1)
|
|
|
- var featureOrder = Object.keys(obj)
|
|
|
+
|
|
|
+ var featureOrder = Object.keys(obj).length>=Object.keys(obj2).length?Object.keys(obj):Object.keys(obj2)
|
|
|
featureOrder.forEach(item=>{
|
|
|
+ if(!obj[item]){
|
|
|
+ obj[item] = JSON.parse(JSON.stringify(obj2[item]))
|
|
|
+ obj[item].evidenceReasonId = null
|
|
|
+ obj[item].literatures = null
|
|
|
+ obj[item].evidenceList = null
|
|
|
+ obj[item].noFirst = true
|
|
|
+ }
|
|
|
+ if(obj[item].featureGen == 2 && obj[item].featureOperateMode == 2){
|
|
|
+ obj[item].noFirst = true
|
|
|
+ }
|
|
|
obj[item].secondEvidenceReason = obj2[item]
|
|
|
obj[item].feRbOpinions = (obj2[item]?obj2[item].feRbOpinions:'') || obj[item].feRbOpinions
|
|
|
obj[item].feRbDecisionKey = (obj2[item]?obj2[item].feRbDecisionKey:'') || obj[item].feRbDecisionKey
|