From 3066781ee646cd08eb6c915296b6a294138d4255 Mon Sep 17 00:00:00 2001
From: caiyiling <1321909229@qq.com>
Date: Thu, 9 Jan 2025 11:41:51 +0800
Subject: [PATCH] =?UTF-8?q?ecrf=E7=B3=BB=E7=BB=9F=E9=85=8D=E7=BD=AE?=
 =?UTF-8?q?=E6=9B=B4=E6=94=B9=E5=8F=8AMRI-PDFF=E9=98=85=E7=89=87bug?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/reading.js                            | 10 +++++
 .../components/CriterionQuestionForm.vue      |  8 ++--
 .../template/components/TableQsForm.vue       | 40 +++++++++++++++++--
 .../components/MRIPDFF/QuestionForm.vue       |  3 +-
 4 files changed, 53 insertions(+), 8 deletions(-)

diff --git a/src/api/reading.js b/src/api/reading.js
index 97cce6ba..85717221 100644
--- a/src/api/reading.js
+++ b/src/api/reading.js
@@ -275,3 +275,13 @@ export function submitTaskRowInfo(param, type) {
     data: param
   })
 }
+
+export function deleteSingleTableQuestionMark(param, type) {
+  return request({
+    url: `/DeleteSingleTableQuestionMark/${type}`,
+    method: 'post',
+    data: param
+  })
+}
+
+
diff --git a/src/views/dictionary/template/components/CriterionQuestionForm.vue b/src/views/dictionary/template/components/CriterionQuestionForm.vue
index 74f8191a..542e254f 100644
--- a/src/views/dictionary/template/components/CriterionQuestionForm.vue
+++ b/src/views/dictionary/template/components/CriterionQuestionForm.vue
@@ -450,10 +450,10 @@
         <el-form-item v-if="form.QuestionGenre === 3" label="默认值">
           <el-select v-model="form.DefaultValue" clearable>
             <el-option
-              v-for="item of form.DictionaryCode ? $d[form.DictionaryCode] : []"
-              :key="item.id"
-              :label="item.label"
-              :value="item.value.toString()"
+              v-for="item of highlightAnswers"
+              :key="item.Id"
+              :label="$i18n.locale === 'zh' ? item.ValueCN : item.Value"
+              :value="item.Code"
             />
           </el-select>
         </el-form-item>
diff --git a/src/views/dictionary/template/components/TableQsForm.vue b/src/views/dictionary/template/components/TableQsForm.vue
index d5bd1a24..6d5dd572 100644
--- a/src/views/dictionary/template/components/TableQsForm.vue
+++ b/src/views/dictionary/template/components/TableQsForm.vue
@@ -329,11 +329,17 @@
         </el-form-item>
         <el-form-item v-if="form.TableQuestionType === 3" label="默认值">
           <el-select v-model="form.DefaultValue" clearable>
-            <el-option
+            <!-- <el-option
               v-for="item of form.DictionaryCode ? $d[form.DictionaryCode] : []"
               :key="item.id"
               :label="item.label"
               :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-form-item>
@@ -358,11 +364,17 @@
               />
             </template>
             <template v-else-if="form.DictionaryCode">
-              <el-option
+              <!-- <el-option
                 v-for="item of $d[form.DictionaryCode]"
                 :key="item.id"
                 :label="item.label"
                 :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>
           </el-select>
@@ -669,9 +681,31 @@ export default {
       colOptions: [],
       dicList: [],
       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() {
     this.initForm()
     this.getCriterionDictionary()
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/MRIPDFF/QuestionForm.vue b/src/views/trials/trials-panel/reading/dicoms/components/MRIPDFF/QuestionForm.vue
index 2e63ea65..f6d58cfb 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/MRIPDFF/QuestionForm.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/MRIPDFF/QuestionForm.vue
@@ -203,7 +203,7 @@
 </template>
 <script>
 // import { submitTableQuestion } from '@/api/trials'
-import { saveTableQuestionMark, submitTaskRowInfo, deleteTableQuestionMark } from '@/api/reading'
+import { saveTableQuestionMark, submitTaskRowInfo, deleteTableQuestionMark, deleteSingleTableQuestionMark } from '@/api/reading'
 import DicomEvent from './../DicomEvent'
 import store from '@/store'
 export default {
@@ -528,6 +528,7 @@ export default {
       if (confirm !== 'confirm') return
       
       let measureData = Object.assign({}, this.markList[i].measureData)
+      await deleteSingleTableQuestionMark({Id: measureData.Id}, 11)
       // 移除缓存中的measureData
       await store.dispatch('reading/removeMeasuredData', { visitTaskId: this.visitTaskId, measureData: measureData, questionId: this.parentQsId, rowIndex: this.questionForm.RowIndex, orderMarkName: measureData.OrderMarkName})
       DicomEvent.$emit('getMeasureData')