XCKJ
/
irc_web
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: XCKJ:7e52005dabd1baf4265224e462fc8b30f92ea9c5
Branches Tags
XCKJ:main
XCKJ:uat
XCKJ:uat_us
XCKJ:v1.9.1
XCKJ:v1.11.1
XCKJ:v1.11.3
XCKJ:v1.11.2
XCKJ:v1.11.0
XCKJ:v1.10.1
XCKJ:v1.10.0
XCKJ:v1.9.0
XCKJ:v1.8.0
XCKJ:v1.7.0
XCKJ:v1.6.0
XCKJ:v1.5.4
XCKJ:v1.5.3
XCKJ:v1.5.2
XCKJ:v1.5.1
XCKJ:v1.5.0
XCKJ:v1.4.0
XCKJ:usa
XCKJ:v1.3.2
..
compare: XCKJ:862c6d64ccc4e4d186d2b6dbe38c7cf7fd596641
Branches Tags
XCKJ:main
XCKJ:uat
XCKJ:uat_us
XCKJ:v1.9.1
XCKJ:v1.11.1
XCKJ:v1.11.3
XCKJ:v1.11.2
XCKJ:v1.11.0
XCKJ:v1.10.1
XCKJ:v1.10.0
XCKJ:v1.9.0
XCKJ:v1.8.0
XCKJ:v1.7.0
XCKJ:v1.6.0
XCKJ:v1.5.4
XCKJ:v1.5.3
XCKJ:v1.5.2
XCKJ:v1.5.1
XCKJ:v1.5.0
XCKJ:v1.4.0
XCKJ:usa
XCKJ:v1.3.2

No commits in common. "7e52005dabd1baf4265224e462fc8b30f92ea9c5" and "862c6d64ccc4e4d186d2b6dbe38c7cf7fd596641" have entirely different histories.
7e52005dab ... 862c6d64cc

2 changed files with 16 additions and 55 deletions
Show Stats Expand all files Collapse all files

33
src/views/dictionary/template/components/CriterionQuestionForm.vue
View File

@ -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.$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}
})
this.parentTriggerValOptions =
this.$d[this.parentOptions[index].DictionaryCode]
} 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.$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}
})
this.reParentTriggerValOptions =
this.$d[this.parentOptions[index].DictionaryCode]
} 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.$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}
})
this.reParentTriggerValOptions =
this.$d[this.parentOptions[index].DictionaryCode]
} else {
var options = []
this.parentOptions[index].TypeValue.split('|').forEach(

38
src/views/dictionary/template/components/TableQsForm.vue
View File

@ -710,13 +710,7 @@ export default {
})
if (index !== -1) {
if (this.parentOptions[index].QuestionGenre === 3) {
// 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}
})
this.parentTriggerValOptions = this.$d[this.parentOptions[index].DictionaryCode]
} 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]
let dicCode = 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}
})
console.log(this.$d[this.parentOptions[i].DictionaryCode])
this.reParentTriggerValOptions = this.$d[this.parentOptions[i].DictionaryCode]
} 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]
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}
})
this.parentTriggerValOptions = this.$d[this.parentOptions[index].DictionaryCode]
} 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]
let dicCode = 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}
})
console.log(this.$d[this.parentOptions[index].DictionaryCode])
this.reParentTriggerValOptions = this.$d[this.parentOptions[index].DictionaryCode]
} else {
const options = []
this.parentOptions[index].TypeValue.split('|').forEach((item, index) => {