Merge branch 'main' of https://gitea.frp.extimaging.com/XCKJ/irc_web into main

src/views/dictionary/template/components/EvaluationOfGlobalConfig.vue

@@ -104,7 +104,7 @@
             v-if="config.configType === 2"
             v-loading="loading"
             ref="multipleTable"
-            :data="$d && $d.GlobalAssessType"
+            :data="GlobalAssessType"
             stripe
             @selection-change="handleSelectionChange"
           >
@@ -165,7 +165,7 @@
 
 <script>
 import BaseModel from '@/components/BaseModel'
-import { getAssessType, setAssessType, setDictionaryBaseLineUse, setDictionaryFollowVisitUse, setSystemGlobalInfo, getSystemGlobalInfo } from '@/api/dictionary'
+import { getCriterionDictionary, getAssessType, setAssessType, setDictionaryBaseLineUse, setDictionaryFollowVisitUse, setSystemGlobalInfo, getSystemGlobalInfo } from '@/api/dictionary'
 export default {
   props: {
     data: {
@@ -192,7 +192,8 @@ export default {
       IsMustGlobalReading: false,
       form: {
         IsMustGlobalReading: false
-      }
+      },
+      GlobalAssessType: []
     }
   },
   beforecreate() {
@@ -204,8 +205,17 @@ export default {
   mounted() {
     this.getList()
     this.getSystemGlobalInfo()
+    this.getCriterionDictionary()
   },
   methods: {
+    getCriterionDictionary() {
+      getCriterionDictionary({
+        ReadingCriterionId: this.criterionId,
+        DictionaryCode: 'GlobalAssessType'
+      }).then(res => {
+        this.GlobalAssessType = res.Result.GlobalAssessType
+      })
+    },
     getSystemGlobalInfo() {
       getSystemGlobalInfo({
         SystemCriterionId: this.criterionId