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

@@ -877,7 +877,6 @@ export default {
       btnLoading: false,
       parentOptions: [],
       parentTriggerValOptions: [],
-      reParentTriggerValOptions: [],
       groupOptions: [],
       isParentExistGroup: false,
       lesionTypes: [],
@@ -1002,15 +1001,8 @@ export default {
           })
           if (index !== -1) {
             if (this.parentOptions[index].QuestionGenre === 3) {
-              // this.parentTriggerValOptions =
+              this.parentTriggerValOptions =
-              //   this.$d[this.parentOptions[index].DictionaryCode]
+                this.$d[this.parentOptions[index].DictionaryCode]
-              let dicCode = this.parentOptions[index].DictionaryCode
-              let res = await getCriterionDictionary({ReadingCriterionId: this.data.ReadingQuestionCriterionSystemId,DictionaryCode: dicCode})
-              
-              this.parentTriggerValOptions = res.Result[dicCode].map(i=>{
-                return {id: i.Id, label: this.$i18n.locale === 'zh' ? i.ValueCN : i.Value, value: i.Code}
-              })
-
             } else {
               const options = []
               this.parentOptions[index].TypeValue.split('|').forEach(
@@ -1028,13 +1020,8 @@ export default {
           })
           if (index !== -1) {
             if (this.parentOptions[index].QuestionGenre === 3) {
-              // this.reParentTriggerValOptions =
+              this.reParentTriggerValOptions =
-              //   this.$d[this.parentOptions[index].DictionaryCode]
+                this.$d[this.parentOptions[index].DictionaryCode]
-              let dicCode = this.parentOptions[index].DictionaryCode
-              let res = await getCriterionDictionary({ReadingCriterionId: this.data.ReadingQuestionCriterionSystemId,DictionaryCode: dicCode})
-              this.reParentTriggerValOptions = res.Result[dicCode].map(i=>{
-                return {id: i.Id, label: this.$i18n.locale === 'zh' ? i.ValueCN : i.Value, value: i.Code}
-              })
             } else {
               const options = []
               this.parentOptions[index].TypeValue.split('|').forEach(
@@ -1225,21 +1212,15 @@ export default {
       }
       form.ParentTriggerValue = ''
     },
-    async relevanceQuestionChange(val, form) {
+    relevanceQuestionChange(val, form) {
       if (val) {
         var index = this.parentOptions.findIndex((item) => {
           return item.QuestionId === val
         })
         if (index !== -1) {
           if (this.parentOptions[index].QuestionGenre === 3) {
-            // this.reParentTriggerValOptions =
+            this.reParentTriggerValOptions =
-            //   this.$d[this.parentOptions[index].DictionaryCode]
+              this.$d[this.parentOptions[index].DictionaryCode]
-            let dicCode = this.parentOptions[index].DictionaryCode
-            let res = await getCriterionDictionary({ReadingCriterionId: this.data.ReadingQuestionCriterionSystemId,DictionaryCode: dicCode})
-              
-              this.reParentTriggerValOptions = res.Result[dicCode].map(i=>{
-                return {id: i.Id, label: this.$i18n.locale === 'zh' ? i.ValueCN : i.Value, value: i.Code}
-              })
           } else {
             var options = []
             this.parentOptions[index].TypeValue.split('|').forEach(

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

@@ -710,13 +710,7 @@ export default {
           })
           if (index !== -1) {
             if (this.parentOptions[index].QuestionGenre === 3) {
-              // this.parentTriggerValOptions = this.$d[this.parentOptions[index].DictionaryCode]
+              this.parentTriggerValOptions = this.$d[this.parentOptions[index].DictionaryCode]
-              let dicCode = this.parentOptions[index].DictionaryCode
-              let res = await getCriterionDictionary({ReadingCriterionId: this.criterionId, DictionaryCode: dicCode})
-              
-              this.parentTriggerValOptions = res.Result[dicCode].map(i=>{
-                return {id: i.Id, label: this.$i18n.locale === 'zh' ? i.ValueCN : i.Value, value: i.Code}
-              })
             } else {
               const options = []
               this.parentOptions[index].TypeValue.split('|').forEach((item, index) => {
@@ -732,12 +726,8 @@ export default {
           })
           if (i !== -1) {
             if (this.parentOptions[i].QuestionGenre === 3) {
-              // this.reParentTriggerValOptions = this.$d[this.parentOptions[i].DictionaryCode]
+              console.log(this.$d[this.parentOptions[i].DictionaryCode])
-              let dicCode = this.parentOptions[i].DictionaryCode
+              this.reParentTriggerValOptions = this.$d[this.parentOptions[i].DictionaryCode]
-              let res = await getCriterionDictionary({ReadingCriterionId: this.criterionId, DictionaryCode: dicCode})
-              this.reParentTriggerValOptions = res.Result[dicCode].map(i=>{
-                return {id: i.Id, label: this.$i18n.locale === 'zh' ? i.ValueCN : i.Value, value: i.Code}
-              })
             } else {
               const options = []
               this.parentOptions[i].TypeValue.split('|').forEach((item, index) => {
@@ -815,20 +805,14 @@ export default {
         form.RelevanceValue = ''
       }
     },
-    async parentQuestionChange(val, form) {
+    parentQuestionChange(val, form) {
       if (val) {
         var index = this.parentOptions.findIndex(item => {
           return item.QuestionId === val
         })
         if (index !== -1) {
           if (this.parentOptions[index].QuestionGenre === 3) {
-            // this.parentTriggerValOptions = this.$d[this.parentOptions[index].DictionaryCode]
+            this.parentTriggerValOptions = this.$d[this.parentOptions[index].DictionaryCode]
-             let dicCode = this.parentOptions[index].DictionaryCode
-              let res = await getCriterionDictionary({ReadingCriterionId: this.criterionId, DictionaryCode: dicCode})
-              
-              this.parentTriggerValOptions = res.Result[dicCode].map(i=>{
-                return {id: i.Id, label: this.$i18n.locale === 'zh' ? i.ValueCN : i.Value, value: i.Code}
-              })
           } else {
             const options = []
             this.parentOptions[index].TypeValue.split('|').forEach((item, index) => {
@@ -840,20 +824,16 @@ export default {
       }
       form.ParentTriggerValue = ''
     },
-    async relevanceQuestionChange(val, form) {
+    relevanceQuestionChange(val, form) {
       if (val) {
         var index = this.parentOptions.findIndex(item => {
           return item.QuestionId === val
         })
+        console.log(this.$d[this.parentOptions[index].DictionaryCode], this.parentOptions[index].QuestionGenre)
         if (index !== -1) {
           if (this.parentOptions[index].QuestionGenre === 3) {
-            // this.reParentTriggerValOptions = this.$d[this.parentOptions[index].DictionaryCode]
+            console.log(this.$d[this.parentOptions[index].DictionaryCode])
-            let dicCode = this.parentOptions[index].DictionaryCode
+            this.reParentTriggerValOptions = this.$d[this.parentOptions[index].DictionaryCode]
-            let res = await getCriterionDictionary({ReadingCriterionId: this.criterionId, DictionaryCode: dicCode})
-            
-            this.reParentTriggerValOptions = res.Result[dicCode].map(i=>{
-              return {id: i.Id, label: this.$i18n.locale === 'zh' ? i.ValueCN : i.Value, value: i.Code}
-            })
           } else {
             const options = []
             this.parentOptions[index].TypeValue.split('|').forEach((item, index) => {