WL/laws_weilai
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev_third_stage' into dev_third_stage

Browse Source
This commit is contained in:
zyx.net
2022-08-11 17:35:49 +08:00
parent 05462c5788 58a627eca1
commit f75d5fd9bb
2 changed files with 56 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-web/src/views/documentTools/documentComparison/index.vue
+6 -3
View File
@@ -354,10 +354,13 @@
window.open(newUrl.href, '_blank')
},
initiatingProcessClick() {
let newUrl = this.$router.resolve({
path: '/initiateDocumentComparison'
this.$router.push({
path:'/initiateDocumentComparison'
})
window.open(newUrl.href, '_blank')
// let newUrl = this.$router.resolve({
// path: '/initiateDocumentComparison'
// })
// window.open(newUrl.href, '_blank')
},
deleteData(val) {
let _this = this
jero-web/src/views/processCenter/components/evaluatorFeedback.vue
+50 -2
View File
@@ -43,7 +43,7 @@
v-if="formInline.dataList.length > 1 && (formInline.dataList.length - 1) == index && !disabled"
type="minus-circle"/>
</div>
<a-row :gutter="24">
<a-row :gutter="24" v-if="!disabled">
<a-col :span="12">
<div class="box-title-text">
<div class="title-text">
@@ -87,7 +87,7 @@
</div>
</a-col>
</a-row>
<a-row :gutter="24">
<a-row :gutter="24" v-if="!disabled">
<a-col :span="12">
<div class="box-title-text">
<div class="title-text">
@@ -113,6 +113,48 @@
</div>
</a-col>
</a-row>
<a-row :gutter="24" v-if="disabled">
<a-col :span="24">
<div class="box-title-text">
<div class="title-text">
<span class="title-text-text" :title="$t('relevantSections')">{{$t('relevantSections')}}</span>
</div>
<div class="title-text-right" :class="{'title-text-right-text':disabled}" :title="item.relatedSection">
{{item.relatedSection}}
</div>
</div>
</a-col>
<a-col :span="24">
<div class="box-title-text">
<div class="title-text">
<span class="title-text-text"
:title="$t('problemDescription')">{{$t('problemDescription')}}</span>
</div>
<div class="title-text-right" :class="{'title-text-right-text':disabled}" :title="item.issueOrSuggest">
{{item.issueOrSuggest}}
</div>
</div>
</a-col>
</a-row>
<a-row :gutter="24" v-if="disabled">
<a-col :span="12">
<div class="box-title-text">
<div class="title-text">
<span class="title-text-text" :title="$t('enclosure')">{{$t('enclosure')}}</span>
</div>
<div class="title-text-right">
<span style="color: #21c9cc;cursor: pointer"
v-if="item.accessoryFile" @click="viewUploadedFilesClick(item.accessoryFile)">
{{$t('viewFile')}}
</span>
<span v-else>
--
</span>
</div>
</div>
</a-col>
</a-row>
</div>
<div class="box-text" style="margin-top: 10px" v-if="disabled">
<div class="header-text">
@@ -395,4 +437,10 @@
margin-left: 8px;
cursor: pointer;
}
.title-text-right-text {
overflow: visible;
white-space: normal;
word-break: break-all;
}
</style>