diff --git a/src/components/CustomFormComponents/InputForStandardsForForeign.vue b/src/components/CustomFormComponents/InputForStandardsForForeign.vue index 23b43b317..189e44729 100644 --- a/src/components/CustomFormComponents/InputForStandardsForForeign.vue +++ b/src/components/CustomFormComponents/InputForStandardsForForeign.vue @@ -335,14 +335,27 @@ export default { }, // 点击查看 handlePreview (item) { - let routeUrl = this.$router.resolve({ - name: 'OtherBussStandardDetails', - params: { - id: item.id, - pageType: 'BUSINESS_STAND' - } - }) - window.open(routeUrl.href, '_blank') + console.log(item) + if (item.standType !== 'FOREIGN') { + let routeUrl = this.$router.resolve({ + name: 'OtherBussStandardDetails', + params: { + id: item.id, + pageType: 'BUSINESS_STAND' + } + }) + window.open(routeUrl.href, '_blank') + }else { + + let routeUrl = this.$router.resolve({ + name: 'OtherStandardDetails', + params: { + id: item.id, + pageType: 'FOREIGN_STAND' + } + }) + window.open(routeUrl.href, '_blank') + } }, getResetLawsNumRow() { this.replacePage = 1 diff --git a/src/pages/processCenter/pages/phone/bzjd/step4.vue b/src/pages/processCenter/pages/phone/bzjd/step4.vue index f368802c2..562cc145e 100644 --- a/src/pages/processCenter/pages/phone/bzjd/step4.vue +++ b/src/pages/processCenter/pages/phone/bzjd/step4.vue @@ -245,7 +245,8 @@ + size="1100px" + width="100%">
比对条款: {{ itemsNum }}
相似度:{{ similarityDegree }}
diff --git a/src/pages/processCenter/pages/phone/bzjd/step5.vue b/src/pages/processCenter/pages/phone/bzjd/step5.vue index 0cadf86ad..7bcf00a5c 100644 --- a/src/pages/processCenter/pages/phone/bzjd/step5.vue +++ b/src/pages/processCenter/pages/phone/bzjd/step5.vue @@ -223,7 +223,8 @@ + size="1100px" + width="100%">
比对条款: {{ itemsNum }}
相似度:{{ similarityDegree }}
diff --git a/src/pages/processCenter/pages/phone/bzjd/step6.vue b/src/pages/processCenter/pages/phone/bzjd/step6.vue index 95821e259..f47fb27f4 100644 --- a/src/pages/processCenter/pages/phone/bzjd/step6.vue +++ b/src/pages/processCenter/pages/phone/bzjd/step6.vue @@ -241,7 +241,8 @@ + size="1100px" + width="100%">
比对条款: {{ itemsNum }}
相似度:{{ similarityDegree }}
diff --git a/src/pages/processCenter/pages/phone/bzpg/step7.vue b/src/pages/processCenter/pages/phone/bzpg/step7.vue index f55215802..a9c2e1d93 100644 --- a/src/pages/processCenter/pages/phone/bzpg/step7.vue +++ b/src/pages/processCenter/pages/phone/bzpg/step7.vue @@ -54,6 +54,9 @@ :label="item" :value="item" :name="item"> + + {{ item }} + + + {{ item }} + 0) { // 获取数值 let resultdata = data.list[0]['groupdata'] + let NYLXCLASS = resultdata['NYLXCLASS'] || {} + let NYLX = resultdata['NYLX'] || {} + if (Object.keys(NYLX).length > 0 && Object.keys(NYLXCLASS).length === 0) { + NYLXCLASS = NYLX + } + resultdata['NYLXCLASS'] = NYLXCLASS for (let i = 0; i < seniortype.length; i++) { let nowdata = [{}] + if (typeof this.searchOptions[seniortype[i]] !== 'undefined') { nowdata = this.searchOptions[seniortype[i]].options } + if (typeof this.searchOptions['NYLXCLASS'] !== 'undefined' && seniortype[i] === 'NYLX') { + nowdata = this.searchOptions['NYLXCLASS'].options + } let renameType if (seniortype[i] === 'selectIndex') { for (let j = 0; j < nowdata.length; j++) { @@ -1001,19 +1011,32 @@ renameType = seniortype[i] } let resultsubdata = resultdata[renameType] || {} - console.log(resultsubdata) + console.log('sssss',resultsubdata) let countAll = 0 if (nowdata) { - console.log(nowdata) - for (let ji = 0; ji < nowdata.length; ji++) { - if (resultsubdata[nowdata[ji].value] === undefined) { - nowdata[ji].number = 0 - } else { - nowdata[ji].number = resultsubdata[nowdata[ji].value] - countAll += Number(resultsubdata[nowdata[ji].value]) + if (renameType === 'NYLX'){ + for (let ji = 0; ji < nowdata.length; ji++) { + if (resultsubdata[nowdata[ji].label] === undefined) { + nowdata[ji].number = 0 + } else { + nowdata[ji].number = resultsubdata[nowdata[ji].label] + countAll += Number(resultsubdata[nowdata[ji].label]) + } + console.log('alllllllllllllllllllllllll' + countAll) + } + }else { + for (let ji = 0; ji < nowdata.length; ji++) { + if (resultsubdata[nowdata[ji].label] === undefined) { + nowdata[ji].number = 0 + } else { + nowdata[ji].number = resultsubdata[nowdata[ji].value] + countAll += Number(resultsubdata[nowdata[ji].value]) + } } } nowdata[0].number = countAll + console.log('aaaaa',nowdata) + } } }