Selaa lähdekoodia

bugfix: 8475

reaper 4 vuotta sitten
vanhempi
commit
698cb1ce9a

+ 23 - 9
src/components/knowledgeExtra/AddAssess/index.vue

@@ -161,7 +161,11 @@ it .ql-editor,
               :prop="`klScaleParent[${tableIndex}].content`"
               :rules="rules.title"
             >
-              <el-input maxlength="20" v-model.trim="table.content" />
+              <el-input
+                :prop="`klScaleParent[${tableIndex}].content`"
+                maxlength="20"
+                v-model.trim="table.content"
+              />
             </el-form-item>
             <div style="margin: 0 20px">
               <el-form-item label="内容类型:" label-width="100px">
@@ -202,6 +206,7 @@ it .ql-editor,
                   label="系数:"
                   label-width="70px"
                   :prop="`klScaleParent[${tableIndex}].factor`"
+                  :ref="`klScaleParent[${tableIndex}].factor`"
                   :rules="rules.tableFactor"
                 >
                   <el-input
@@ -218,6 +223,7 @@ it .ql-editor,
                   :rules="rules.tableConstant"
                 >
                   <el-input
+                    :ref="`klScaleParent[${tableIndex}].constant`"
                     type="number"
                     maxlength="6"
                     v-model.number="table.constant"
@@ -279,7 +285,7 @@ it .ql-editor,
           <el-form-item
             label="概述:"
             label-width="70px"
-            ref="editor"
+            :ref="`klScaleParent[${tableIndex}].klScaleSaveGroup[0].content`"
             :prop="`klScaleParent[${tableIndex}].klScaleSaveGroup[0].content`"
             :rules="rules.fwbContent"
           >
@@ -353,7 +359,7 @@ const defaultDate = {
   two_resultType: 0,
   two_ruleCode: "",
   two_score: 0,
-  two_selectType: 1,
+  two_selectType: 21,
   two_status: 0,
   two_textType: 21,
   content: "",
@@ -416,7 +422,7 @@ export default {
                 two_resultType: 0,
                 two_ruleCode: "",
                 two_score: 0,
-                two_selectType: 1,
+                two_selectType: 21,
                 two_status: 1,
                 two_textType: 21,
                 content: "",
@@ -519,10 +525,9 @@ export default {
       console.log(thisIssueId);
       this.scaleData.klScaleParent[tableIndex].klScaleSaveGroup.forEach(
         (item) => {
-          item[name] = value;
+          if (item.issueId === thisIssueId) item[name] = value;
         }
       );
-      console.log(this.scaleData.klScaleParent[tableIndex].klScaleSaveGroup);
     },
     onEditorChange(e) {
       e.quill.deleteText(1000, 4);
@@ -705,7 +710,7 @@ export default {
                 resultType: 0,
                 ruleCode: "string",
                 score: null,
-                selectType: 0,
+                selectType: 21,
                 status: 2,
                 textType: 21
               }
@@ -746,11 +751,14 @@ export default {
     assessCommit() {
       // new Promise((resolve))
       let valid1 = new Promise((resolve, reject) => {
-        this.$refs["scaleFormRef"].validate((valid, object) => {
+        this.$refs["scaleFormRef"].validate((valid, object, err) => {
           if (valid) {
             resolve();
           } else {
             reject("c");
+            console.log("valid", valid, object, err);
+            let div = this.$refs["elscrollbar"];
+            console.log("div", div);
             return false;
           }
         });
@@ -988,12 +996,17 @@ export default {
         };
 
         this.childScaleData.klScaleDetail.forEach((table, tableIndex) => {
+          console.log("?????");
           if (table.textType === 13) {
             // 计算结果
             scoreresults.scoreresultsdatas = table.subMenuList[0].subMenuList;
             scoreresults.scoreresultsdatas.forEach((item) => {
               item.content = JSON.parse(item.content);
             });
+            console.log(
+              "scoreresults.scoreresultsdatas",
+              scoreresults.scoreresultsdatas
+            );
           } else if (table.textType === 11) {
             // 选项
             obj.klScaleParent.push({
@@ -1085,7 +1098,8 @@ export default {
         // console.dir(scoreresults);
 
         this.scaleData = obj;
-        this.scoreresults = scoreresults;
+        if (scoreresults.scoreresultsdatas.length)
+          this.scoreresults = scoreresults;
       }
     }
   },

+ 4 - 4
src/components/knowledgeExtra/AddAssess/scale-table.vue

@@ -182,14 +182,14 @@
           <template slot-scope="scope">
             <div class="table_select_btn">
               <el-button
-                @click="handleSelectTypeBtn(scope.$index, 1)"
-                :style="scope.row.two_selectType != 1 ? { color: '#999' } : ''"
+                @click="handleSelectTypeBtn(scope.$index, 21)"
+                :style="scope.row.two_selectType != 21 ? { color: '#999' } : ''"
                 type="text"
                 >单选</el-button
               >
               <el-button
-                :style="scope.row.two_selectType != 2 ? { color: '#999' } : ''"
-                @click="handleSelectTypeBtn(scope.$index, 2)"
+                :style="scope.row.two_selectType != 22 ? { color: '#999' } : ''"
+                @click="handleSelectTypeBtn(scope.$index, 22)"
                 type="text"
                 >多选</el-button
               >