Merge branch 'uat' into uat_us
commit
b9f3b24608
|
@ -1,5 +1,5 @@
|
||||||
<template>
|
<template>
|
||||||
<BaseContainer>
|
<BaseContainer class="enroll-list">
|
||||||
<!-- <template slot="search-container">
|
<!-- <template slot="search-container">
|
||||||
<el-button
|
<el-button
|
||||||
v-hasPermi="['trials:trials-panel:enrolled-reviewers:list:enroll']"
|
v-hasPermi="['trials:trials-panel:enrolled-reviewers:list:enroll']"
|
||||||
|
@ -96,16 +96,15 @@
|
||||||
<el-table-column
|
<el-table-column
|
||||||
:label="$t('trials:enrolledReviews:table:readingType')"
|
:label="$t('trials:enrolledReviews:table:readingType')"
|
||||||
width="300"
|
width="300"
|
||||||
show-overflow-tooltip
|
|
||||||
>
|
>
|
||||||
<template slot-scope="scope">
|
<template slot-scope="scope">
|
||||||
<span v-for="item of scope.row.CriterionCategoryList.find(v => {return v.TrialReadingCriterionId === ite.TrialReadingCriterionId}) ? scope.row.CriterionCategoryList.find(v => {return v.TrialReadingCriterionId === ite.TrialReadingCriterionId}).ReadingCategorys : []" :key="item.TrialReadingCriterionId">
|
<span v-for="item of scope.row.CriterionCategoryList.find(v => {return v.TrialReadingCriterionId === ite.TrialReadingCriterionId}) ? scope.row.CriterionCategoryList.find(v => {return v.TrialReadingCriterionId === ite.TrialReadingCriterionId}).ReadingCategorys : []" :key="item.TrialReadingCriterionId" style="margin:5px 5px 5px 0;">
|
||||||
<el-tag v-if="item === 1" type="primary">{{ $fd('ReadingCategory', item) + ' & ' + $fd('ReadingCategory', 2) }}</el-tag>
|
<el-tag v-if="item === 1" type="primary">{{ $fd('ReadingCategory', item) + ' & ' + $fd('ReadingCategory', 2) }}</el-tag>
|
||||||
<!-- <el-tag v-if="item === 2" type="info">{{ $fd('ReadingCategory', item) }}</el-tag>-->
|
<!-- <el-tag v-if="item === 2" type="info">{{ $fd('ReadingCategory', item) }}</el-tag>-->
|
||||||
<el-tag v-if="item === 4" type="danger">{{ $fd('ReadingCategory', item) }}</el-tag>
|
<el-tag v-if="item === 4" type="danger">{{ $fd('ReadingCategory', item) }}</el-tag>
|
||||||
<el-tag v-if="item === 5" type="warning">{{ $fd('ReadingCategory', item) }}</el-tag>
|
<el-tag v-if="item === 5" type="warning">{{ $fd('ReadingCategory', item) }}</el-tag>
|
||||||
</span>
|
</span>
|
||||||
<el-button
|
<el-button
|
||||||
v-hasPermi="['trials:trials-panel:enrolled-reviewers:list:edit']"
|
v-hasPermi="['trials:trials-panel:enrolled-reviewers:list:edit']"
|
||||||
type="text"
|
type="text"
|
||||||
@click="openSetEnrollReadingCategory(scope.row, ite.TrialReadingCriterionId)"
|
@click="openSetEnrollReadingCategory(scope.row, ite.TrialReadingCriterionId)"
|
||||||
|
@ -248,7 +247,7 @@
|
||||||
</template>
|
</template>
|
||||||
</base-model>
|
</base-model>
|
||||||
<!-- 修改 readingCategory -->
|
<!-- 修改 readingCategory -->
|
||||||
<base-model :config="readingCategory_model">
|
<base-model :config="readingCategory_model" class="readingCategory_model">
|
||||||
<template slot="dialog-body">
|
<template slot="dialog-body">
|
||||||
<!-- Reading Type -->
|
<!-- Reading Type -->
|
||||||
<label>{{ $t('trials:enrolledReviews:table:readingType') }}: </label>
|
<label>{{ $t('trials:enrolledReviews:table:readingType') }}: </label>
|
||||||
|
@ -258,7 +257,7 @@
|
||||||
allow-create
|
allow-create
|
||||||
multiple
|
multiple
|
||||||
default-first-option
|
default-first-option
|
||||||
style="width: 70%"
|
style="width: 50%;"
|
||||||
>
|
>
|
||||||
<template v-for="item of $d.ReadingCategory">
|
<template v-for="item of $d.ReadingCategory">
|
||||||
<el-option v-if="item.value === 1" :key="item.id" :value="1" :label="$fd('ReadingCategory', 1) + ' & ' + $fd('ReadingCategory', 2)" />
|
<el-option v-if="item.value === 1" :key="item.id" :value="1" :label="$fd('ReadingCategory', 1) + ' & ' + $fd('ReadingCategory', 2)" />
|
||||||
|
@ -433,7 +432,7 @@ export default {
|
||||||
visible: false,
|
visible: false,
|
||||||
title: this.$t('trials:enrolledReviews:dialogTitle:changeReadingType'),
|
title: this.$t('trials:enrolledReviews:dialogTitle:changeReadingType'),
|
||||||
showClose: true,
|
showClose: true,
|
||||||
width: '500px',
|
width: '600px',
|
||||||
btnLoading: false
|
btnLoading: false
|
||||||
},
|
},
|
||||||
reviewerStatus_model: {
|
reviewerStatus_model: {
|
||||||
|
@ -823,10 +822,11 @@ export default {
|
||||||
<style lang="scss">
|
<style lang="scss">
|
||||||
.enroll-list {
|
.enroll-list {
|
||||||
height: 100%;
|
height: 100%;
|
||||||
.filter-box {
|
.readingCategory_model{
|
||||||
display: flex;
|
.base-modal-body{
|
||||||
align-items: center;
|
min-height: 150px;
|
||||||
padding: 5px 0px;
|
padding-bottom: 30px !important;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
</style>
|
</style>
|
||||||
|
|
Loading…
Reference in New Issue