Compare commits

..

No commits in common. "447b74fa55b31e4262179e79ac18f5bc9e331d05" and "1cc57ad1d6737fbfbeaf6fbed6675d0a8870a7c0" have entirely different histories.

1 changed files with 4 additions and 7 deletions

View File

@ -1,12 +1,10 @@
<template> <template>
<div class="criterion-form-item"> <div class="criterion-form-item">
<div <div v-if="!!question.GroupName && question.Type === 'group'"
v-if="(!!question.GroupName && question.Type === 'group') && ((question.ShowQuestion === 1 && question.ParentTriggerValueList.includes(String(questionForm[question.ParentId]))) || question.ShowQuestion === 0)"
style="font-weight: bold;font-size: 16px;margin: 5px 0px;color:#fff;"> style="font-weight: bold;font-size: 16px;margin: 5px 0px;color:#fff;">
{{ question.GroupName }} {{ question.GroupName }}
</div> </div>
<div <div v-if="question.Type === 'table' || question.Type === 'basicTable'"
v-if="(question.Type === 'table' || question.Type === 'basicTable') && ((question.ShowQuestion === 1 && question.ParentTriggerValueList.includes(String(questionForm[question.ParentId]))) || question.ShowQuestion === 0)"
style="font-weight: bold;font-size: 14px;margin: 5px 0px;"> style="font-weight: bold;font-size: 14px;margin: 5px 0px;">
<div style="display: flex;justify-content: space-between;align-items: center;color:#fff;margin: 10px 0 5px"> <div style="display: flex;justify-content: space-between;align-items: center;color:#fff;margin: 10px 0 5px">
<span :title="question.Remark">{{ question.QuestionName }}</span> <span :title="question.Remark">{{ question.QuestionName }}</span>
@ -16,8 +14,7 @@
{{ $t('common:button:add') }} {{ $t('common:button:add') }}
</el-button> </el-button>
</div> </div>
<el-table :data="questionForm[question.Id]" <el-table :data="questionForm[question.Id]">
v-if="(question.ShowQuestion === 1 && question.ParentTriggerValueList.includes(String(questionForm[question.ParentId]))) || question.ShowQuestion === 0">
<el-table-column :label="$t('CustomizeQuestionFormItem:label:OrderMark')" width="60px" show-overflow-tooltip> <el-table-column :label="$t('CustomizeQuestionFormItem:label:OrderMark')" width="60px" show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
{{ question.OrderMark }}{{ scope.$index + 1 }} {{ question.OrderMark }}{{ scope.$index + 1 }}