From 28be57dfee1e1085f553c7938649604f8a56d514 Mon Sep 17 00:00:00 2001
From: caiyiling <1321909229@qq.com>
Date: Tue, 22 Oct 2024 17:41:36 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AF=BC=E5=87=BA=E6=A0=87=E8=AF=86=E6=A0=B9?=
 =?UTF-8?q?=E6=8D=AE=E6=A0=87=E5=87=86=E8=BF=87=E6=BB=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/CriterionQuestionForm.vue      | 19 ++++++++++---------
 .../template/components/TableQsForm.vue       | 13 +++++++------
 2 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/src/views/dictionary/template/components/CriterionQuestionForm.vue b/src/views/dictionary/template/components/CriterionQuestionForm.vue
index 76664a4d..25d97000 100644
--- a/src/views/dictionary/template/components/CriterionQuestionForm.vue
+++ b/src/views/dictionary/template/components/CriterionQuestionForm.vue
@@ -263,10 +263,11 @@
       <el-form-item label="导出结果" v-if="form.ExportIdentification" prop="ExportResult">
         <el-select v-model="form.ExportResult" multiple>
           <el-option
-            v-for="item in $d.ExportResult"
-            :key="`ExportResult${item.value}`"
-            :label="item.label"
-            :value="item.value">
+            v-for="item in CriterionDictionaryList.ExportResult"
+            :key="item.Id"
+            :value="parseInt(item.Code)"
+            :label="$i18n.locale === 'zh' ? item.ValueCN : item.Value"
+          >
           </el-option>
         </el-select>
       </el-form-item>
@@ -314,7 +315,7 @@
             v-for="item of CriterionDictionaryList.QuestionType"
             :key="item.Id"
             :value="parseInt(item.Code)"
-            :label="item.ValueCN"
+            :label="$i18n.locale === 'zh' ? item.ValueCN : item.Value"
           />
         </el-select>
       </el-form-item>
@@ -480,7 +481,7 @@
             <el-option
               v-for="item of highlightAnswers"
               :key="item.Id"
-              :label="item.ValueCN"
+              :label="$i18n.locale === 'zh' ? item.ValueCN : item.Value"
               :value="item.Code"
             />
           </template>
@@ -496,7 +497,7 @@
             v-for="item of groupClassifyList"
             :key="item.Id"
             :value="parseInt(item.Code)"
-            :label="item.ValueCN"
+            :label="$i18n.locale === 'zh' ? item.ValueCN : item.Value"
           />
         </el-select>
       </el-form-item>
@@ -590,7 +591,7 @@
             v-for="item of lesionTypeList"
             :key="item.Id"
             :value="parseInt(item.Code)"
-            :label="item.ValueCN"
+            :label="$i18n.locale === 'zh' ? item.ValueCN : item.Value"
           />
         </el-select>
       </el-form-item>
@@ -917,7 +918,7 @@ export default {
     getCriterionDictionary() {
       getCriterionDictionary({
         ReadingCriterionId: this.data.ReadingQuestionCriterionSystemId,
-        DictionaryCode: 'QuestionType',
+        DictionaryCodeList: ['QuestionType', 'ExportResult'],
       }).then((res) => {
         this.CriterionDictionaryList = res.Result
       })
diff --git a/src/views/dictionary/template/components/TableQsForm.vue b/src/views/dictionary/template/components/TableQsForm.vue
index 99d064a6..4f4ff872 100644
--- a/src/views/dictionary/template/components/TableQsForm.vue
+++ b/src/views/dictionary/template/components/TableQsForm.vue
@@ -168,10 +168,11 @@
       <el-form-item :label="$t('trials:readingUnit:qsList:title:ExportResult')" v-if="form.ExportIdentification" prop="ExportResult">
         <el-select v-model="form.ExportResult" multiple>
           <el-option
-            v-for="item in $d.ExportResult"
+            v-for="item in CriterionDictionaryList.ExportResult"
             :key="`ExportResult${item.value}`"
-            :label="item.label"
-            :value="item.value">
+            :value="parseInt(item.Code)"
+            :label="$i18n.locale === 'zh' ? item.ValueCN : item.Value"
+          >
           </el-option>
         </el-select>
       </el-form-item>
@@ -199,7 +200,7 @@
             v-for="item of CriterionDictionaryList.QuestionMark"
             :key="item.Id"
             :value="parseInt(item.Code)"
-            :label="item.ValueCN"
+            :label="$i18n.locale === 'zh' ? item.ValueCN : item.Value"
           />
         </el-select>
       </el-form-item>
@@ -302,7 +303,7 @@
           <el-option
             v-for="item of CriterionDictionaryList.OrganColumn"
             :key="item.Id"
-            :label="item.ValueCN"
+            :label="$i18n.locale === 'zh' ? item.ValueCN : item.Value"
             :value="item.Code"
           />
         </el-select>
@@ -680,7 +681,7 @@ export default {
     getCriterionDictionary() {
       getCriterionDictionary({
         ReadingCriterionId: this.criterionId,
-        DictionaryCodeList: ['QuestionMark', 'OrganColumn']
+        DictionaryCodeList: ['QuestionMark', 'OrganColumn', 'ExportResult']
       }).then(res => {
         this.CriterionDictionaryList = res.Result
       })