Compare commits

..

No commits in common. "a19d756879fe67c1cb980f92ecba11efe7169217" and "3633de8c35f4e012914b051220a3823615e8fe84" have entirely different histories.

6 changed files with 68 additions and 231 deletions

View File

@ -156,27 +156,12 @@
</el-checkbox-group>
<!-- 自动分类 -->
<el-input
v-if="question.Type === 'class' && question.ClassifyShowType === 1"
v-if="question.Type === 'class' && !question.TypeValue"
v-model="questionForm[question.Id]"
/>
<el-select
v-if="question.Type === 'class' && question.ClassifyShowType === 2"
v-model="questionForm[question.Id]"
:disabled="!question.ClassifyEditType"
@change="(val) => { formItemChange(val, question) }"
>
<el-option
v-for="val in question.TypeValue.split('|')"
:key="val"
:label="val.trim()"
:value="val.trim()"
/>
</el-select>
<el-radio-group
v-if="question.Type === 'class' && question.ClassifyShowType === 3"
v-if="question.Type === 'class' && question.TypeValue"
v-model="questionForm[question.Id]"
:disabled="!question.ClassifyEditType"
@change="(val) => { formItemChange(val, question) }"
>
<el-radio
v-for="item of question.TypeValue.split('|')"

View File

@ -97,27 +97,12 @@
</el-checkbox-group>
<!-- 自动分类 -->
<el-input
v-if="question.Type === 'class' && question.ClassifyShowType === 1"
v-if="question.Type === 'class' && !question.TypeValue"
v-model="questionForm[question.Id]"
/>
<el-select
v-if="question.Type === 'class' && question.ClassifyShowType === 2"
v-model="questionForm[question.Id]"
:disabled="!question.ClassifyEditType"
@change="(val) => { formItemChange(val, question) }"
>
<el-option
v-for="val in question.TypeValue.split('|')"
:key="val"
:label="val.trim()"
:value="val.trim()"
/>
</el-select>
<el-radio-group
v-if="question.Type === 'class' && question.ClassifyShowType === 3"
v-if="question.Type === 'class' && question.TypeValue"
v-model="questionForm[question.Id]"
:disabled="!question.ClassifyEditType"
@change="(val) => { formItemChange(val, question) }"
>
<el-radio
v-for="item of question.TypeValue.split('|')"

View File

@ -198,28 +198,12 @@
/>
<!-- 自动分类 -->
<el-input
v-if="question.Type === 'class' && question.ClassifyShowType === 1"
v-if="question.Type === 'class' && !question.TypeValue"
v-model="questionForm[question.Id]"
:disabled="!question.ClassifyEditType"
/>
<el-select
v-if="question.Type === 'class' && question.ClassifyShowType === 2"
v-model="questionForm[question.Id]"
:disabled="!question.ClassifyEditType"
@change="(val) => { formItemChange(val, question) }"
>
<el-option
v-for="val in question.TypeValue.split('|')"
:key="val"
:label="val.trim()"
:value="val.trim()"
/>
</el-select>
<el-radio-group
v-if="question.Type === 'class' && question.ClassifyShowType === 3"
v-if="question.Type === 'class' && question.TypeValue"
v-model="questionForm[question.Id]"
:disabled="!question.ClassifyEditType"
@change="(val) => { formItemChange(val, question) }"
>
<el-radio
v-for="item of question.TypeValue.split('|')"

View File

@ -103,28 +103,12 @@
/>
<!-- 自动计算 -->
<el-input
v-if="question.Type === 'class' && question.ClassifyShowType === 1"
v-if="question.Type === 'class' && !question.TypeValue"
v-model="questionForm[question.Id]"
:disabled="!question.ClassifyEditType"
/>
<el-select
v-if="question.Type === 'class' && question.ClassifyShowType === 2"
v-model="questionForm[question.Id]"
:disabled="!question.ClassifyEditType"
@change="(val) => { formItemChange(val, question) }"
>
<el-option
v-for="val in question.TypeValue.split('|')"
:key="val"
:label="val.trim()"
:value="val.trim()"
/>
</el-select>
<el-radio-group
v-if="question.Type === 'class' && question.ClassifyShowType === 3"
v-if="question.Type === 'class' && question.TypeValue"
v-model="questionForm[question.Id]"
:disabled="!question.ClassifyEditType"
@change="(val) => { formItemChange(val, question) }"
>
<el-radio
v-for="item of question.TypeValue.split('|')"
@ -134,7 +118,6 @@
{{ item.trim() }}
</el-radio>
</el-radio-group>
<!-- 自增 -->
<el-input
v-if="question.Type==='increment'"

View File

@ -910,48 +910,6 @@
</el-table>
</div>
</el-form-item>
<!-- 分类是否可编辑 -->
<el-form-item
v-if="form.Type === 'class'"
:label="$t('trials:readingUnit:qsList:title:ClassifyEditType')"
prop="ClassifyEditType"
:rules="[
{ required: true, message: this.$t('common:ruleMessage:select'), trigger: 'blur' }
]"
>
<el-radio-group
v-model="form.ClassifyEditType"
>
<el-radio
v-for="item of $d.ClassifyEditType"
:key="item.id"
:label="item.value"
>
{{ item.label }}
</el-radio>
</el-radio-group>
</el-form-item>
<!-- 分类显示类型 -->
<el-form-item
v-if="form.Type === 'class'"
:label="$t('trials:readingUnit:qsList:title:ClassifyShowType')"
prop="ClassifyShowType"
:rules="[
{ required: true, message: this.$t('common:ruleMessage:select'), trigger: 'blur' }
]"
>
<el-radio-group
v-model="form.ClassifyShowType"
>
<el-radio
v-for="item of $d.ClassifyShowType"
:key="item.id"
:label="item.value"
>
{{ item.label }}
</el-radio>
</el-radio-group>
</el-form-item>
</div>
</div>
<div class="base-dialog-footer" style="text-align:right;margin-top:10px;">
@ -1068,8 +1026,6 @@ export default {
ExportIdentification: 0,
ExportResult: [],
ClassifyType: null,
ClassifyEditType: null,
ClassifyShowType: null
// IsEnable: true
},
rules: {
@ -1523,11 +1479,6 @@ export default {
} else {
form.MaxAnswerLength = null
}
if (val === 'class') {
form.ClassifyEditType = 1
} else {
form.ClassifyEditType = null
}
form.IsRequired = 2
form.LesionType = null
form.ImageCount = 0
@ -1548,7 +1499,6 @@ export default {
form.ExportIdentification = 0
form.ExportResult = []
form.ClassifyType = null
form.ClassifyShowType = null
},
getLesionType() {
return new Promise((resolve, reject) => {

View File

@ -750,48 +750,6 @@
</el-table>
</div>
</el-form-item>
<!-- 分类是否可编辑 -->
<el-form-item
v-if="form.Type === 'class'"
:label="$t('trials:readingUnit:qsList:title:ClassifyEditType')"
prop="ClassifyEditType"
:rules="[
{ required: true, message: this.$t('common:ruleMessage:select'), trigger: 'blur' }
]"
>
<el-radio-group
v-model="form.ClassifyEditType"
>
<el-radio
v-for="item of $d.ClassifyEditType"
:key="item.id"
:label="item.value"
>
{{ item.label }}
</el-radio>
</el-radio-group>
</el-form-item>
<!-- 分类显示类型 -->
<el-form-item
v-if="form.Type === 'class'"
:label="$t('trials:readingUnit:qsList:title:ClassifyShowType')"
prop="ClassifyShowType"
:rules="[
{ required: true, message: this.$t('common:ruleMessage:select'), trigger: 'blur' }
]"
>
<el-radio-group
v-model="form.ClassifyShowType"
>
<el-radio
v-for="item of $d.ClassifyShowType"
:key="item.id"
:label="item.value"
>
{{ item.label }}
</el-radio>
</el-radio-group>
</el-form-item>
</div>
</div>
@ -890,9 +848,7 @@ export default {
ExportIdentification: 0,
ExportResult: [],
ImageCount: 0,
ClassifyType: null,
ClassifyEditType: null,
ClassifyShowType: null,
ClassifyType: null
// IsEnable: true
},
rules: {
@ -1282,11 +1238,6 @@ export default {
} else {
form.MaxAnswerLength = null
}
if (val === 'class') {
form.ClassifyEditType = 1
} else {
form.ClassifyEditType = null
}
form.IsRequired = 2
form.TypeValue = ''
form.TableQuestionType = null
@ -1309,7 +1260,6 @@ export default {
form.ExportResult = []
form.ImageCount = 0
form.ClassifyType = null
form.ClassifyShowType = null
},
close() {
this.$emit('close')