部分问题修复
continuous-integration/drone/push Build is passing
Details
continuous-integration/drone/push Build is passing
Details
parent
096e11e9fd
commit
3dc99d096d
|
|
@ -165,7 +165,7 @@
|
|||
</el-tooltip>
|
||||
<!-- 融合 -->
|
||||
<el-tooltip
|
||||
v-show="!isConvertedTask && !!item.TableQuestions.Answers[i].RowId && item.TableQuestions.Answers[i].SplitOrMergeType !== '2' && ((item.LesionType === 0 && [0, 1, 4].includes(parseInt(item.TableQuestions.Answers[i].lesionState))))"
|
||||
v-show="!isFirstChangeTask && !!item.TableQuestions.Answers[i].RowId && item.TableQuestions.Answers[i].SplitOrMergeType !== '2' && ((item.LesionType === 0 && [0, 1, 4].includes(parseInt(item.TableQuestions.Answers[i].lesionState))))"
|
||||
class="item" :content="$t('trials:reading:button:merge')" placement="bottom">
|
||||
<i class="iconfont icon-24gl-merge" style="color:#fff;font-size: 16px;"
|
||||
@click.stop="handleMerge(item.TableQuestions.Answers[i], item.Id, item.OrderMark)" />
|
||||
|
|
|
|||
|
|
@ -2533,15 +2533,13 @@ export default {
|
|||
if (this.isFusion || this.isMPR) {
|
||||
const confirm = await this.$confirm(this.$t('trials:reading:confirm:changeStack'))
|
||||
if (!confirm) return false
|
||||
if (this.isMPR) {
|
||||
this.rows = 1
|
||||
this.cols = 1
|
||||
}
|
||||
this.isFusion = false
|
||||
this.isMPR = false
|
||||
this.fullScreenIndex = null
|
||||
this.setToolsPassive()
|
||||
}
|
||||
this.rows = 1
|
||||
this.cols = 1
|
||||
if (taskIndex === this.activeTaskIndex) return
|
||||
if (!this.selectArr.includes(taskInfo.VisitTaskId)) {
|
||||
this.selectArr.push(taskInfo.VisitTaskId)
|
||||
|
|
|
|||
|
|
@ -36,14 +36,14 @@
|
|||
/>
|
||||
<!-- 分组 -->
|
||||
<el-table-column
|
||||
prop="GroupName"
|
||||
prop="QuestionGroupName"
|
||||
v-if="$i18n.locale === 'zh'"
|
||||
:label="$t('trials:readingUnit:qsList:title:groupNameEn')"
|
||||
show-overflow-tooltip
|
||||
/>
|
||||
<!-- 分组(EN) -->
|
||||
<el-table-column
|
||||
prop="GroupEnName"
|
||||
prop="QuestionGroupEnName"
|
||||
v-if="$i18n.locale === 'en'"
|
||||
:label="$t('trials:readingUnit:qsList:title:groupNameEn')"
|
||||
show-overflow-tooltip
|
||||
|
|
|
|||
Loading…
Reference in New Issue