Compare commits

..

No commits in common. "401762dca71e40b697ead9b3100b0116c3850340" and "3cef5afebd4aeda9ef44e2513df98b9115a3fbc8" have entirely different histories.

4 changed files with 4 additions and 5 deletions

View File

@ -112,6 +112,7 @@
</el-input> </el-input>
<el-input <el-input
v-else v-else
type="number"
@change="(val) => { formItemChange(val, item) }" @change="(val) => { formItemChange(val, item) }"
@input="numberInput(item.Id)" @input="numberInput(item.Id)"
@blur="handleBlur(questionForm[item.Id], questionForm, item)" @blur="handleBlur(questionForm[item.Id], questionForm, item)"

View File

@ -120,6 +120,7 @@
</el-input> </el-input>
<el-input <el-input
v-else v-else
type="number"
@change="(val) => { formItemChange(val, item) }" @change="(val) => { formItemChange(val, item) }"
@input="numberInput(item.Id)" @input="numberInput(item.Id)"
@blur="handleBlur(questionForm[item.Id], questionForm, item)" @blur="handleBlur(questionForm[item.Id], questionForm, item)"

View File

@ -91,7 +91,7 @@
@change="((val) => { formItemChange(val, question) })" /> @change="((val) => { formItemChange(val, question) })" />
<!-- 下拉框 --> <!-- 下拉框 -->
<el-select v-else-if="question.Type === 'select'" v-model="questionForm[question.Id]" <el-select v-else-if="question.Type === 'select'" v-model="questionForm[question.Id]"
:disabled="readingTaskState >= 2 || ((question.TableQuestionType === 2 || question.QuestionGenre === 2) && !!question.DictionaryCode) || isFirstChangeTask || question.QuestionType === 50 || question.QuestionType === 55 || question.QuestionType === 1026" :disabled="readingTaskState >= 2 || ((question.TableQuestionType === 2 || question.QuestionGenre === 2) && !!question.DictionaryCode) || isFirstChangeTask || question.QuestionType === 50 || question.QuestionType === 55"
clearable :multiple="question.OptionTypeEnum === 1" @change="((val) => { formItemChange(val, question) })"> clearable :multiple="question.OptionTypeEnum === 1" @change="((val) => { formItemChange(val, question) })">
<template v-if="question.TableQuestionType === 1"> <template v-if="question.TableQuestionType === 1">
<el-option v-for="item in organList" :key="item.Id" :label="item[question.DataTableColumn]" <el-option v-for="item in organList" :key="item.Id" :label="item[question.DataTableColumn]"

View File

@ -234,10 +234,7 @@ export default {
obj.forEach(i => { obj.forEach(i => {
i.IsBaseLineTask = this.isBaseLineTask i.IsBaseLineTask = this.isBaseLineTask
if (i.Type !== 'group' && i.Type !== 'summary' && i.Id) { if (i.Type !== 'group' && i.Type !== 'summary' && i.Id) {
let answer = i.Type === 'select' && i.OptionTypeEnum === 1 && i.Answer ? JSON.parse(i.Answer) : i.Answer const answer = i.Type === 'select' && i.OptionTypeEnum === 1 && i.Answer ? JSON.parse(i.Answer) : i.Answer
if (i.DictionaryCode && i.Type === 'calculation') {
answer = this.$fd(i.DictionaryCode, parseInt(i.Answer))
}
this.$set(this.questionForm, i.Id, answer ? answer : null) this.$set(this.questionForm, i.Id, answer ? answer : null)
if (i.QuestionType === 44) { if (i.QuestionType === 44) {
// //