diff --git a/src/components/common/PopupQuesResult.vue b/src/components/common/PopupQuesResult.vue index e0ef376ca..2ff267c69 100644 --- a/src/components/common/PopupQuesResult.vue +++ b/src/components/common/PopupQuesResult.vue @@ -32,7 +32,7 @@ -
{{ item.title }}
-{{ item.title }}
-@@ -164,8 +168,11 @@ export default { }, CheckBoxExtraRadio: { handler(newVal) { - if(!!newVal) { + if(!!newVal&&this.answerList[1].includes('B')) { // 创建一个新对象,保留原对象的所有属性,只修改subOption为空 + if(newVal=='N'){ + this.CheckBoxExtraDesc = '' + } const updatedItem = { ...this.assessQuestionnaireDtoList[1], subOption: newVal, @@ -178,7 +185,7 @@ export default { }, CheckBoxExtraDesc:{ handler(newVal) { - if(!!newVal) { + if(!!newVal&&this.answerList[1].includes('B')) { // 创建一个新对象,保留原对象的所有属性,只修改subOption为空 const updatedItem = { ...this.assessQuestionnaireDtoList[1], @@ -192,7 +199,10 @@ export default { 'answerList.1': { handler(newVal) { console.log('检测到了第一项数据', newVal) + if(!newVal.includes('B')) { + this.CheckBoxExtraDesc = '' + this.CheckBoxExtraRadio ='' const updatedItem = { ...this.assessQuestionnaireDtoList[1], subOption: null, @@ -360,12 +370,10 @@ export default { questionContent:item.title, choose:this.filterCheckBoxElement('letter',e,item), chooseContent:this.filterCheckBoxElement('content',e,item), - //subOption:null, - //subOptionContent:null, score:this.filterCheckBoxElement('score',e,item), chooseDesc:null, - subOption: this.assessQuestionnaireDtoList[1].subOption?this.assessQuestionnaireDtoList[1].subOption:null, - subOptionContent:this.assessQuestionnaireDtoList[1].subOptionContent?this.assessQuestionnaireDtoList[1].subOptionContent:null + subOption:this.CheckBoxExtraRadio?this.CheckBoxExtraRadio:null, + subOptionContent:this.CheckBoxExtraDesc?this.CheckBoxExtraDesc:null, }) console.log('answerList',this.answerList) @@ -427,11 +435,6 @@ export default { }) }, - validatePositiveInteger(value) { - const regex = /^(?:[1-9]\d{0,3}|[1-9]\d{0,3}(?:,\d{3})*)$/; - return regex.test(value) && value <= 10000; - }, - clickOverlay(){ this.showResultPopup = false }, @@ -475,7 +478,6 @@ export default { loadingType: 'spinner', message: '加载中……' }) - this.$toast.clear() saveEvalateAnswer({assessQuestionnaireDtoList:this.assessQuestionnaireDtoList}) .then(res =>{ this.$toast.clear()