Compare commits
No commits in common. "a129adbc4b7deb18b6c32cedc55f7bb19daab4d3" and "df4880dc087f23be8c33acfd9838e5a64ddc8d03" have entirely different histories.
a129adbc4b
...
df4880dc08
|
@ -275,13 +275,3 @@ export function submitTaskRowInfo(param, type) {
|
||||||
data: param
|
data: param
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
export function deleteSingleTableQuestionMark(param, type) {
|
|
||||||
return request({
|
|
||||||
url: `/DeleteSingleTableQuestionMark/${type}`,
|
|
||||||
method: 'post',
|
|
||||||
data: param
|
|
||||||
})
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -450,10 +450,10 @@
|
||||||
<el-form-item v-if="form.QuestionGenre === 3" label="默认值">
|
<el-form-item v-if="form.QuestionGenre === 3" label="默认值">
|
||||||
<el-select v-model="form.DefaultValue" clearable>
|
<el-select v-model="form.DefaultValue" clearable>
|
||||||
<el-option
|
<el-option
|
||||||
v-for="item of highlightAnswers"
|
v-for="item of form.DictionaryCode ? $d[form.DictionaryCode] : []"
|
||||||
:key="item.Id"
|
:key="item.id"
|
||||||
:label="$i18n.locale === 'zh' ? item.ValueCN : item.Value"
|
:label="item.label"
|
||||||
:value="item.Code"
|
:value="item.value.toString()"
|
||||||
/>
|
/>
|
||||||
</el-select>
|
</el-select>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
|
|
|
@ -329,17 +329,11 @@
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item v-if="form.TableQuestionType === 3" label="默认值">
|
<el-form-item v-if="form.TableQuestionType === 3" label="默认值">
|
||||||
<el-select v-model="form.DefaultValue" clearable>
|
<el-select v-model="form.DefaultValue" clearable>
|
||||||
<!-- <el-option
|
<el-option
|
||||||
v-for="item of form.DictionaryCode ? $d[form.DictionaryCode] : []"
|
v-for="item of form.DictionaryCode ? $d[form.DictionaryCode] : []"
|
||||||
:key="item.id"
|
:key="item.id"
|
||||||
:label="item.label"
|
:label="item.label"
|
||||||
:value="item.value.toString()"
|
:value="item.value.toString()"
|
||||||
/> -->
|
|
||||||
<el-option
|
|
||||||
v-for="item of highlightAnswers"
|
|
||||||
:key="item.Id"
|
|
||||||
:label="$i18n.locale === 'zh' ? item.ValueCN : item.Value"
|
|
||||||
:value="item.Code"
|
|
||||||
/>
|
/>
|
||||||
</el-select>
|
</el-select>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
|
@ -364,17 +358,11 @@
|
||||||
/>
|
/>
|
||||||
</template>
|
</template>
|
||||||
<template v-else-if="form.DictionaryCode">
|
<template v-else-if="form.DictionaryCode">
|
||||||
<!-- <el-option
|
<el-option
|
||||||
v-for="item of $d[form.DictionaryCode]"
|
v-for="item of $d[form.DictionaryCode]"
|
||||||
:key="item.id"
|
:key="item.id"
|
||||||
:label="item.label"
|
:label="item.label"
|
||||||
:value="item.value.toString()"
|
:value="item.value.toString()"
|
||||||
/> -->
|
|
||||||
<el-option
|
|
||||||
v-for="item of highlightAnswers"
|
|
||||||
:key="item.Id"
|
|
||||||
:label="$i18n.locale === 'zh' ? item.ValueCN : item.Value"
|
|
||||||
:value="item.Code"
|
|
||||||
/>
|
/>
|
||||||
</template>
|
</template>
|
||||||
</el-select>
|
</el-select>
|
||||||
|
@ -681,31 +669,9 @@ export default {
|
||||||
colOptions: [],
|
colOptions: [],
|
||||||
dicList: [],
|
dicList: [],
|
||||||
CriterionDictionaryList: [],
|
CriterionDictionaryList: [],
|
||||||
Questions: [],
|
Questions: []
|
||||||
highlightAnswers: []
|
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
watch: {
|
|
||||||
'form.DictionaryCode': {
|
|
||||||
deep: true,
|
|
||||||
immediate: true,
|
|
||||||
async handler(v, oldv) {
|
|
||||||
try {
|
|
||||||
if (!v) {
|
|
||||||
this.highlightAnswers = []
|
|
||||||
return
|
|
||||||
}
|
|
||||||
let res = await getCriterionDictionary({
|
|
||||||
ReadingCriterionId: this.criterionId,
|
|
||||||
DictionaryCode: this.form.DictionaryCode,
|
|
||||||
})
|
|
||||||
this.highlightAnswers = res.Result[this.form.DictionaryCode]
|
|
||||||
} catch (e) {
|
|
||||||
console.log(e)
|
|
||||||
}
|
|
||||||
},
|
|
||||||
},
|
|
||||||
},
|
|
||||||
mounted() {
|
mounted() {
|
||||||
this.initForm()
|
this.initForm()
|
||||||
this.getCriterionDictionary()
|
this.getCriterionDictionary()
|
||||||
|
|
|
@ -203,7 +203,7 @@
|
||||||
</template>
|
</template>
|
||||||
<script>
|
<script>
|
||||||
// import { submitTableQuestion } from '@/api/trials'
|
// import { submitTableQuestion } from '@/api/trials'
|
||||||
import { saveTableQuestionMark, submitTaskRowInfo, deleteTableQuestionMark, deleteSingleTableQuestionMark } from '@/api/reading'
|
import { saveTableQuestionMark, submitTaskRowInfo, deleteTableQuestionMark } from '@/api/reading'
|
||||||
import DicomEvent from './../DicomEvent'
|
import DicomEvent from './../DicomEvent'
|
||||||
import store from '@/store'
|
import store from '@/store'
|
||||||
export default {
|
export default {
|
||||||
|
@ -528,7 +528,6 @@ export default {
|
||||||
if (confirm !== 'confirm') return
|
if (confirm !== 'confirm') return
|
||||||
|
|
||||||
let measureData = Object.assign({}, this.markList[i].measureData)
|
let measureData = Object.assign({}, this.markList[i].measureData)
|
||||||
await deleteSingleTableQuestionMark({Id: measureData.Id}, 11)
|
|
||||||
// 移除缓存中的measureData
|
// 移除缓存中的measureData
|
||||||
await store.dispatch('reading/removeMeasuredData', { visitTaskId: this.visitTaskId, measureData: measureData, questionId: this.parentQsId, rowIndex: this.questionForm.RowIndex, orderMarkName: measureData.OrderMarkName})
|
await store.dispatch('reading/removeMeasuredData', { visitTaskId: this.visitTaskId, measureData: measureData, questionId: this.parentQsId, rowIndex: this.questionForm.RowIndex, orderMarkName: measureData.OrderMarkName})
|
||||||
DicomEvent.$emit('getMeasureData')
|
DicomEvent.$emit('getMeasureData')
|
||||||
|
|
Loading…
Reference in New Issue