diff --git a/src/views/dictionary/template/components/CriterionQuestionForm.vue b/src/views/dictionary/template/components/CriterionQuestionForm.vue index 1497357c..d59218b5 100644 --- a/src/views/dictionary/template/components/CriterionQuestionForm.vue +++ b/src/views/dictionary/template/components/CriterionQuestionForm.vue @@ -642,8 +642,8 @@ prop="ClassifyQuestionId" > - + - + @@ -144,11 +142,7 @@ @@ -173,6 +167,7 @@ @@ -203,10 +198,23 @@ /> + + + {{ item.trim() }} + + { - if (this.question.Type === "class") { - let o = this.ClassifyAlgorithmsList.find((v) => { - return ( - this.questionForm[this.question.ClassifyQuestionId] >= v.gt && - this.questionForm[this.question.ClassifyQuestionId] < v.lt - ); - }); - if (this.questionForm[this.question.ClassifyQuestionId]) { - this.questionForm[this.question.Id] = o ? o.label : null; - } else { - this.questionForm[this.question.Id] = null; - } - } - }, 300); + // setInterval(() => { + // if (this.question.Type === "class") { + // let o = this.ClassifyAlgorithmsList.find((v) => { + // return ( + // this.questionForm[this.question.ClassifyQuestionId] >= v.gt && + // this.questionForm[this.question.ClassifyQuestionId] < v.lt + // ); + // }); + // if (this.questionForm[this.question.ClassifyQuestionId]) { + // this.questionForm[this.question.Id] = o ? o.label : null; + // } else { + // this.questionForm[this.question.Id] = null; + // } + // } + // }, 300); if (this.question.Type === "upload") { if (this.questionForm[this.question.Id]) { this.urls = this.questionForm[this.question.Id].split("|"); @@ -475,19 +480,19 @@ export default { }); } } - if (this.question.Type === "table") { - // this.getQuestionCalculateRelation() - if (this.questionForm[this.question.Id]) { - this.QuestionsForm = {}; - this.question.TableQuestions.Questions.forEach((v) => { - if (v.Type === "number") { - this.$set(this.QuestionsForm, v.Id, 0); - } else { - this.$set(this.QuestionsForm, v.Id, ""); - } - }); - } - } + // if (this.question.Type === "table") { + // // this.getQuestionCalculateRelation() + // if (this.questionForm[this.question.Id]) { + // this.QuestionsForm = {}; + // this.question.TableQuestions.Questions.forEach((v) => { + // if (v.Type === "number") { + // this.$set(this.QuestionsForm, v.Id, 0); + // } else { + // this.$set(this.QuestionsForm, v.Id, ""); + // } + // }); + // } + // } }, methods: { getQuestionCalculateRelation() { @@ -499,11 +504,13 @@ export default { }); }, save() { - this.AnswersList.push(this.QuestionsForm); + // this.AnswersList.push(this.QuestionsForm); this.$emit("setFormItemData", { key: this.question.Id, - val: this.AnswersList, + val: this.QuestionsForm, + type: 'table' }); + this.question.TableQuestions.Answers.push(this.QuestionsForm) this.formItemNumberChange(this.question.Id, true); this.addOrEdit.visible = false; }, @@ -689,11 +696,17 @@ export default { }); }, openAddTableCol(row) { - + this.QuestionsForm = {} + this.classArr = [] this.addOrEdit.title = row.QuestionName + this.$t("trials:readingUnit:qsList:title:tableQs"); // '表格问题' this.QuestionsList = row.TableQuestions.Questions; - this.AnswersList = row.TableQuestions.Answers; + row.TableQuestions.Questions.map(v=>{ + if (v.Type === 'class') { + this.classArr.push({triggerId: v.ClassifyTableQuestionId, classId: v.Id, classifyAlgorithms: v.ClassifyAlgorithms, classifyType: v.ClassifyType}) + } + }) + // this.AnswersList = row.TableQuestions.Answers; row.TableQuestions.Questions.map(i=>{ this.$set(this.QuestionsForm, i.Id, null) }) @@ -734,6 +747,8 @@ export default { // } this.$emit("setFormItemData", { key: qs.Id, val: val }); }); + } else { + this.$emit("setFormItemData", { key: question.Id, val: v }) } }, resetChild(obj) { @@ -751,7 +766,29 @@ export default { this.$emit("setFormItemData", obj); }, setTblFormItemData(obj) { + console.log('setTblFormItemData', this.classArr) this.$set(this.QuestionsForm, obj.key, obj.val) + if (this.classArr.length > 0) { + let qs = this.classArr.find(i=>i.triggerId === obj.key) + if (!qs) return + let answer = null + let list = JSON.parse(qs.classifyAlgorithms) + if (qs.classifyType === 0) { + let o = list.find(v => { + return ( + parseFloat(obj.val) >= parseFloat(v.gt) && + parseFloat(obj.val) < parseFloat(v.lt) + ) + }) + answer = o ? o.label : null + } else if (qs.classifyType === 1) { + let o = list.find(v => { + return v.val.includes(obj.val) + }) + answer = o ? o.label : null + } + this.$set(this.QuestionsForm, qs.classId, answer) + } }, resetTblFormItemData(obj) { this.$set(this.QuestionsForm, obj.key, null) diff --git a/src/views/trials/trials-panel/setting/reading-unit/components/QuestionTableFormItem.vue b/src/views/trials/trials-panel/setting/reading-unit/components/QuestionTableFormItem.vue index bd172ee6..d152565c 100644 --- a/src/views/trials/trials-panel/setting/reading-unit/components/QuestionTableFormItem.vue +++ b/src/views/trials/trials-panel/setting/reading-unit/components/QuestionTableFormItem.vue @@ -103,10 +103,23 @@ /> + + + {{ item.trim() }} + + { - if (this.question.Type === "class") { - if (this.questionForm[this.question.ClassifyTableQuestionId]) { - let o = this.ClassifyAlgorithmsList.find((v) => { - return ( - this.questionForm[this.question.ClassifyTableQuestionId] >= v.gt && - this.questionForm[this.question.ClassifyTableQuestionId] < v.lt - ); - }); - this.$emit('setFormItemData', { key: this.question.Id, val: o ? o.label : null }) - } else { - this.$emit('setFormItemData', { key: this.question.Id, val: null }) - } - } - }, 300); + if (this.question.Type === 'upload') { if (this.questionForm[this.question.Id]) { this.urls = this.questionForm[this.question.Id].split('|') @@ -302,9 +300,6 @@ export default { this.getOrganInfoList() } }, - beforeDestroy() { - clearInterval(this.timer) - }, methods: { save() { }, @@ -326,9 +321,6 @@ export default { }) }, formItemChange(v, question) { - if (question.Childrens.length > 0) { - this.resetChild(question.Childrens) - } if (question.TableQuestionType === 1 && question.RelationQuestions.length > 0) { var index = this.organList.findIndex(item => item[question.DataTableColumn] === v) if (index < 0) return @@ -340,6 +332,8 @@ export default { // } this.$emit('setFormItemData', { key: qs.Id, val: val }) }) + } else { + this.$emit('setFormItemData', { key: question.Id, val: v }) } }, formItemNumberChange(v, question) { @@ -359,21 +353,8 @@ export default { setFormItemData(obj) { this.$emit('setFormItemData', obj) }, - async uploadScreenshot(param) { - if (!this.visitTaskId) return - const loading = this.$loading({ - target: document.querySelector('.ecrf-wrapper'), - fullscreen: false, - lock: true, - text: 'Loading', - spinner: 'el-icon-loading' - }) - var file = await this.fileToBlob(param.file) - const res = await this.OSSclient.put(`/${this.trialId}/ReadAttachment/${this.subjectId}/${this.visitTaskId}/${param.file.name}`, file) - this.fileList.push({ name: param.file.name, url: this.$getObjectName(res.url) }) - this.urls.push(this.$getObjectName(res.url)) - this.$emit('setFormItemData', { key: this.question.Id, val: this.urls.length > 0 ? this.urls.join('|') : '' }) - loading.close() + uploadScreenshot(param) { + }, handleBeforeUpload(file) { // 检测文件类型是否符合要求 diff --git a/src/views/trials/trials-panel/setting/reading-unit/components/QuestionsForm.vue b/src/views/trials/trials-panel/setting/reading-unit/components/QuestionsForm.vue index d5646930..042833b3 100644 --- a/src/views/trials/trials-panel/setting/reading-unit/components/QuestionsForm.vue +++ b/src/views/trials/trials-panel/setting/reading-unit/components/QuestionsForm.vue @@ -405,7 +405,7 @@ :label="$t('trials:qcCfg:table:typeValue')" prop="TypeValue" :rules="[ - {required: form.Type !== 'number', trigger: ['blur', 'change']}, + {required: form.Type !== 'number', trigger: ['blur', 'change'], message: this.$t('common:ruleMessage:specify')}, {validator: validateTypeVal, trigger: ['blur', 'change']}, {max: 200, message: `${this.$t('common:ruleMessage:maxLength')} 200`}]" > @@ -663,8 +663,12 @@ > @@ -677,13 +681,13 @@ > @@ -762,8 +766,29 @@ + + + + {{ item.label }} + + + - + + + + + + +
+ + + + + + + + + + +
+
@@ -904,7 +991,7 @@ export default { ParentTriggerValueList: [], ShowOrder: 0, ShowQuestion: 0, - IsRequired: 2, + IsRequired: 0, IsJudgeQuestion: false, GroupName: '', GroupEnName: '', @@ -937,7 +1024,8 @@ export default { LimitShow: 0, HighlightAnswerList: [], ExportIdentification: 0, - ExportResult: [] + ExportResult: [], + ClassifyType: null, // IsEnable: true }, rules: { @@ -977,10 +1065,14 @@ export default { groupOptions: [], isParentExistGroup: false, lesionTypes: [], - Questions: [], tableQuestions: [], isShow: true, - validateTypeVal:null + validateTypeVal:null, + numberQuestions: [], + classQuestions: [], + selectQuestions: [], + classifyQuestionOptions: [], + selectedClassifyOptions: [] } }, watch: { @@ -990,14 +1082,14 @@ export default { }, mounted() { this.validateTypeVal = (rule, value, callback) => { - if (value === '') { + if (value === '' && this.form.Type !== 'number') { callback(new Error(this.$t('common:ruleMessage:specify'))) } else { var arr = value.split('|') if (new Set(arr).size !== arr.length) { // '选项不允许存在相同值' callback(new Error(this.$t('trials:readingUnit:qsList:message:msg0'))) - } else if (this.form.Type === 'number' && arr.findIndex(i=>isNaN(parseFloat(i)) && i!== 'NE') > -1) { + } else if (value && this.form.Type === 'number' && arr.findIndex(i=>isNaN(parseFloat(i)) && i!== 'NE') > -1) { callback(new Error(this.$t('trials:readingUnit:qsList:message:msg5'))) } else { callback() @@ -1006,22 +1098,48 @@ export default { } this.initForm() this.getBasicConfigSelect() - this.getCalculateQuestions('number') - this.getCalculateQuestions('table') + this.getCalculateQuestions(['number', 'select', 'radio', 'basicTable']) + // this.getTableQuestions() + // this.getCalculateQuestions('number') + // this.getCalculateQuestions('table') }, methods: { + classifyTypeChange(v) { + this.form.ClassifyQuestionId = '' + if (this.ClassifyAlgorithmsList.length === 0 && this.form.TypeValue) { + let list = this.form.TypeValue.split('|') + this.ClassifyAlgorithmsList = list.map((res, i) => { + return this.form.ClassifyType === 0 ? { + label: res.trim(), + lt: 0, + gt: 0 + } : { + label: res.trim(), + val: [] + } + }) + } + }, typeValueChange(v) { this.form.DefaultValue = null var list = v.split('|') this.form.ClassifyAlgorithms = null - var arr = Object.assign([], this.ClassifyAlgorithmsList) - this.ClassifyAlgorithmsList = list.map((res, i) => { - return { - label: res, - lt: arr[i] ? arr[i].lt : 0, - gt: arr[i] ? arr[i].gt : 0 - } - }) + if (this.form.ClassifyType === 0) { + this.ClassifyAlgorithmsList = list.map((res, i) => { + return { + label: res.trim(), + lt: 0, + gt: 0 + } + }) + } else if (this.form.ClassifyType === 1) { + this.ClassifyAlgorithmsList = list.map((res, i) => { + return { + label: res.trim(), + val: [] + } + }) + } }, getBasicConfigSelect() { // getBasicConfigSelect('Reading_eCRF_Criterion').then(res => { @@ -1072,18 +1190,54 @@ export default { this.isShow = true }) }, - getCalculateQuestions(type) { - getCalculateQuestions({ - TrialCriterionId: this.trialCriterionId, - type: type - }).then(res => { - if (type === 'table') { - this.tableQuestions = res.Result - } else { - this.Questions = res.Result + async getCalculateQuestions(types) { + try { + let params = { + trialCriterionId: this.trialCriterionId, + typeList: types } - }) + let res = await getCalculateQuestions(params) + if (res.Result) { + this.tableQuestions = res.Result.filter(i=>i.Type === 'basicTable') + this.selectQuestions = res.Result.filter(i=>i.Type === 'select' || i.Type === 'radio') + this.numberQuestions = res.Result.filter(i=>i.Type === 'number') + } + } catch(e) { + console.log(e) + } }, + async getTableQuestions() { + try { + let params = { + trialCriterionId: this.trialCriterionId, + type: 'basicTable' + } + let res = await getCalculateQuestions(params) + if (res.Result) { + this.tableQuestions = res.Result + } + } catch(e) { + console.log(e) + } + }, + classifyQuestionChange (v){ + let obj = this.selectQuestions.find(i=>i.Id === v) + let arr = obj && obj.TypeValue ? obj.TypeValue.split('|') : [] + arr = arr.length > 0 ? arr.map(i=>i.trim()) : [] + this.classifyQuestionOptions = arr + }, + // getCalculateQuestions(type) { + // getCalculateQuestions({ + // TrialCriterionId: this.trialCriterionId, + // type: type + // }).then(res => { + // if (type === 'table') { + // this.tableQuestions = res.Result + // } else { + // this.Questions = res.Result + // } + // }) + // }, async initForm() { // this.Questions = await getCalculateQuestions({ // QuestionId: this.trialCriterionId, @@ -1112,6 +1266,9 @@ export default { } } } + if (this.form.ClassifyQuestionId) { + this.classifyQuestionChange(this.form.ClassifyQuestionId) + } if (this.form.ParentId !== '' && this.form.ParentId !== null && this.form.GroupName !== '') { this.isParentExistGroup = true } @@ -1344,6 +1501,7 @@ export default { form.HighlightAnswerList = [] form.ExportIdentification = 0 form.ExportResult = [] + form.ClassifyType = null }, getLesionType() { return new Promise((resolve, reject) => { diff --git a/src/views/trials/trials-panel/setting/reading-unit/components/QuestionsPreview.vue b/src/views/trials/trials-panel/setting/reading-unit/components/QuestionsPreview.vue index 2e00247a..105165b3 100644 --- a/src/views/trials/trials-panel/setting/reading-unit/components/QuestionsPreview.vue +++ b/src/views/trials/trials-panel/setting/reading-unit/components/QuestionsPreview.vue @@ -27,7 +27,7 @@