Merge branch 'main' of https://gitea.frp.extimaging.com/XCKJ/irc_web
continuous-integration/drone/push Build is passing Details

main
wangxiaoshuang 2026-06-02 14:57:26 +08:00
commit 4030b1c95b
2 changed files with 10 additions and 7 deletions

View File

@ -352,9 +352,11 @@ export default {
// 1104 -- MRI-PDFF 1105 --
this.$set(this.questionForm, 'saveTypeEnum', 1)
if (qs.QuestionMark === 1105) {
const meanId = this.getQuestionId(1104)
if (!v) {
const meanId = this.getQuestionId(1104)
this.$set(this.questionForm, meanId, 'NE')
} else {
this.$set(this.questionForm, meanId, '')
}
}
this.setQuestions()
@ -545,10 +547,9 @@ export default {
}
await store.dispatch('reading/removeMeasuredData', { visitTaskId: this.visitTaskId, measureData: this.questionForm.MeasureData, questionId: this.parentQsId, rowIndex: this.questionForm.RowIndex })
DicomEvent.$emit('getMeasureData')
this.$set(this.questionForm, 'IsDicomReading', true)
this.$set(this.questionForm, 'MeasureData', '')
this.isDisabledMeasurableRadio = false
let anwsers = Object.assign({}, this.questionForm)
this.$emit('resetQuestions', { mean: '', isMeasurable, saveTypeEnum: this.questionForm.saveTypeEnum, rowIndex: this.rowIndex, questionId: this.parentQsId, anwsers: anwsers })
DicomEvent.$emit('refreshStudyListMeasureData')
@ -565,9 +566,9 @@ export default {
DicomEvent.$emit('getScreenshots', { questionId: this.parentQsId, rowIndex: this.questionForm.RowIndex, visitTaskId: this.visitTaskId, lesionName: this.lesionMark, lesionType: this.lesionType, isMarked: !!measureData }, async val => {
try {
let picturePath = ''
if (val && measureData && this.questionForm.IsDicomReading) {
if (val && measureData) {
let pictureObj = await this.uploadScreenshots(`${new Date().getTime()}`, val)
picturePath = pictureObj.isSuccess ? this.$getObjectName(pictureObj.result.url) : ''
}
let answers = []
@ -595,7 +596,7 @@ export default {
picturePath: picturePath,
markTool: measureData ? measureData.type : ''
}
const res = await submitTaskRowInfo(params, 11)
const res = await submitTaskRowInfo(params, 13)
if (res.IsSuccess) {
//
this.$message.success(this.$t('common:message:savedSuccessfully'))

View File

@ -61,7 +61,9 @@
<!-- 输入框 -->
<div>
<template
v-if="!((task.IsBaseLine && scope.row.LimitEdit === 1) || (!task.IsBaseLine && scope.row.LimitEdit === 2) || scope.row.LimitEdit === 0)" />
v-if="!((task.IsBaseLine && scope.row.LimitEdit === 1) || (!task.IsBaseLine && scope.row.LimitEdit === 2) || scope.row.LimitEdit === 0)">
<!-- {{ `${questionForm[scope.row.QuestionId] instanceof Array ? questionForm[scope.row.QuestionId][scope.row.xfIndex][scope.row.TableQuestionId] : questionForm[scope.row.QuestionId]}` }} -->
</template>
<el-input
v-else-if="questionForm[scope.row.QuestionId] instanceof Array && (scope.row.Type === 'input' || scope.row.Type === 'textarea') && !scope.row.IsShowInDicom && ((task.IsBaseLine && scope.row.LimitEdit === 1) || (!task.IsBaseLine && scope.row.LimitEdit === 2) || scope.row.LimitEdit === 0)"
v-model="questionForm[scope.row.QuestionId][scope.row.xfIndex][scope.row.TableQuestionId]"