diff --git a/src/views/research/ResearchAdd.vue b/src/views/research/ResearchAdd.vue
index 4837e2a3..2423e2bb 100644
--- a/src/views/research/ResearchAdd.vue
+++ b/src/views/research/ResearchAdd.vue
@@ -87,7 +87,7 @@ const canSubmit = computed(() => {
data.value.scoringQuestionVoList
];
- return lists.some(list => Array.isArray(list) && list.length > 0);
+ return lists.some(list => Array.isArray(list) && list?.filter(item=>!item.deleted).length > 0);
});
// const orderList = computed(()=>[...data.value.singleStemVoList.filter(t=>!t.deleted),...data.value.multipleStemVoList.filter(t=>!t.deleted),...data.value.essayQuestionVoList.filter(t=>!t.deleted),...data.value.scoringQuestionVoList.filter(t=>!t.deleted)].sort((a,b)=>a.orderNumber-b.orderNumber))
const orderList = computed(() => {
@@ -103,7 +103,13 @@ const orderList = computed(() => {
.sort((a, b) => a.orderNumber - b.orderNumber);
});
watch(()=>orderList.value.length,()=> orderList.value.forEach((t,i)=>t.orderNumber = i + 1))
-watchEffect(() => id && request(ASSESSMENT_DETAIL(id), {}).then((res) => data.value = res.data));
+watchEffect(() => id && request(ASSESSMENT_DETAIL(id), {}).then((res) =>{
+ res.data.singleStemVoList = res.data.singleStemVoList || []
+ res.data.multipleStemVoList = res.data.multipleStemVoList || []
+ res.data.essayQuestionVoList = res.data.essayQuestionVoList || []
+ res.data.scoringQuestionVoList = res.data.scoringQuestionVoList || []
+ data.value = res.data
+}));
const handleSave = () => {
console.log(data);
loading.value = true;
@@ -112,12 +118,12 @@ const handleSave = () => {
loading.value = false;
return false;
}
- const listsss = data.value.scoringQuestionVoList.map((item) => ({
- minimumEvaluation: item.minimumEvaluation || '非常不满意',
- highestEvaluation: item.highestEvaluation || '非常满意',
- orderNumber: item.orderNumber,
- assessmentId: id,
- }));
+ // const listsss = data.value.scoringQuestionVoList.map((item) => ({
+ // minimumEvaluation: item.minimumEvaluation || '非常不满意',
+ // highestEvaluation: item.highestEvaluation || '非常满意',
+ // orderNumber: item.orderNumber,
+ // assessmentId: id,
+ // }));
// // 如果 assessmentId 有值调用
// if(id){
// request('/activitySubmit/editAssessmentScore post',listsss).then((res)=>{
@@ -238,11 +244,11 @@ const checkVal = () => {
return false;
}
// 评分
- if (data.value.scoringQuestionVoList.length && data.value.scoringQuestionVoList?.some((item) => !item.deleted && (!item.assessmentScTitle))) {
+ if (data.value.scoringQuestionVoList?.length && data.value.scoringQuestionVoList?.some((item) => !item.deleted && (!item.assessmentScTitle))) {
message.error("评分题干为必填 请确认!");
return false;
}
- if (data.value.scoringQuestionVoList.length && data.value.scoringQuestionVoList.reduce((pre, cur) => pre + parseInt(cur.weightScale), 0) !== 100) {
+ if (data.value.scoringQuestionVoList?.filter(item=>!item.deleted)?.length && data.value.scoringQuestionVoList?.filter(item=>!item.deleted)?.reduce((pre, cur) => pre + parseInt(cur.weightScale), 0) !== 100) {
message.error("当前权重设置是百分制 请重新配置");
return false;
}
diff --git a/src/views/research/components/ResearchAddAsk.vue b/src/views/research/components/ResearchAddAsk.vue
index cd55f218..d1007afe 100644
--- a/src/views/research/components/ResearchAddAsk.vue
+++ b/src/views/research/components/ResearchAddAsk.vue
@@ -43,7 +43,10 @@