From 5cb3a9219bc17787a8e65deccaee08da859ef09f Mon Sep 17 00:00:00 2001
From: yuping <82253452@qq.com>
Date: Thu, 13 Apr 2023 16:34:55 +0800
Subject: [PATCH] =?UTF-8?q?--fix=20bug=20=E8=AF=84=E4=BC=B0bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/research/ResearchAdd.vue            | 23 +++++++++++++++----
 .../research/components/ResearchAddMulti.vue  |  1 +
 .../research/components/ResearchAddSingle.vue |  1 +
 3 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/src/views/research/ResearchAdd.vue b/src/views/research/ResearchAdd.vue
index f7311ee5..459c8cb4 100644
--- a/src/views/research/ResearchAdd.vue
+++ b/src/views/research/ResearchAdd.vue
@@ -325,11 +325,14 @@ export default {
         itm.orderNumber = idx + 1;
         return itm;
       });
+      console.log(222);
+      console.log(resultArr);
       return resultArr;
     };
     // 解散传值
     const parseItem = (arr) => {
       const filterComObj = filterCommon(arr, "questionType");
+      console.log('filterComObj')
       console.log(filterComObj)
       let resultObj = {};
       for (let key in filterComObj) {
@@ -384,11 +387,13 @@ export default {
             type,
             id: state.allFormsData.length + 1,
             valueSingle: "",
+            deleted: false,
             singleList: [
               {
                 id: 1,
                 inputVal: "",
                 imgVal: "",
+                deleted: false,
               },
             ],
           };
@@ -398,11 +403,13 @@ export default {
             type,
             id: state.allFormsData.length + 1,
             valueMutil: "",
+            deleted: false,
             mutilList: [
               {
                 id: 1,
                 inputVal: "",
                 imgVal: "",
+                deleted: false,
               },
             ],
           };
@@ -413,6 +420,7 @@ export default {
             id: state.allFormsData.length + 1,
             valueAsk: "",
             valueAskDesc: "",
+            deleted: false,
           };
           break;
         case 4:
@@ -423,6 +431,7 @@ export default {
             minScore: 1,
             maxScore: 10,
             pinQuan: 100,
+            deleted: false,
           };
           break;
       }
@@ -546,7 +555,6 @@ export default {
             }else{
               let obj1 = {...data[i][k]}
               delete obj1.id
-              delete obj1.deleted
               arr1.push(obj1)
             }
           }
@@ -560,7 +568,6 @@ export default {
             }else{
               let obj1 = {...data[i][k]}
               delete obj1.id
-              delete obj1.deleted
               arr1.push(obj1)
             }
           }
@@ -658,7 +665,11 @@ export default {
       }
       // 多选
       console.log(filterData.assessmentMultipleChoiceDtoList);
-      if(filterData.assessmentMultipleChoiceDtoList?.some((item) => !item.multipleStemName || !item.multipleOptionName)){
+      if(filterData.assessmentMultipleChoiceDtoList && !filterData.assessmentMultipleChoiceDtoList.some(t=>!t.deleted)){
+        message.error("多选题最少添加一个选项!");
+        return false;
+      }
+      if(filterData.assessmentMultipleChoiceDtoList?.some((item) => !item.deleted && (!item.multipleStemName || !item.multipleOptionName))){
         message.error("多选题干或选项为必填 请确认!");
         return false;
       }
@@ -687,7 +698,11 @@ export default {
         }
       }
       // 单选
-      if(filterData.assessmentSingleChoiceDtoList?.some((item) => !item.singleStemName || !item.singleOptionName)){
+      if(filterData.assessmentSingleChoiceDtoList && !filterData.assessmentSingleChoiceDtoList.length){
+        message.error("单选题最少添加一个选项!");
+        return false;
+      }
+      if(filterData.assessmentSingleChoiceDtoList?.some((item) => !item.deleted && (!item.singleStemName || !item.singleOptionName))){
         message.error("单选题干或选项为必填 请确认!");
         return false;
       }
diff --git a/src/views/research/components/ResearchAddMulti.vue b/src/views/research/components/ResearchAddMulti.vue
index 70c2bfbe..045653b2 100644
--- a/src/views/research/components/ResearchAddMulti.vue
+++ b/src/views/research/components/ResearchAddMulti.vue
@@ -92,6 +92,7 @@ export default {
         id: curItem.value.mutilList.length + 1,
         inputVal: "",
         imgVal: "",
+        deleted: false
       });
     };
     const imgSrcMutil = ({ id, src }) => {
diff --git a/src/views/research/components/ResearchAddSingle.vue b/src/views/research/components/ResearchAddSingle.vue
index ed39e78b..d5728155 100644
--- a/src/views/research/components/ResearchAddSingle.vue
+++ b/src/views/research/components/ResearchAddSingle.vue
@@ -88,6 +88,7 @@ export default {
         id: curItem.value.singleList.length + 1,
         inputVal: "",
         imgVal: "",
+        deleted: false
       });
     };
     const imgSrc = ({ id, src }) => {