标题加高

src/components/knowledgeExtra/AddAssess/index.vue

@@ -739,7 +739,8 @@ export default {
           if (valid) {
             resolve();
           } else {
-            reject();
+            console.log('ccccccc');
+            reject("c");
             return false;
           }
         });
@@ -749,7 +750,7 @@ export default {
           if (valid) {
             resolve();
           } else {
-            reject();
+            reject("c");
             return false;
           }
         });

src/components/knowledgeExtra/AddDevKnow.vue

@@ -91,7 +91,7 @@
               :label="titleChange"
               prop="titleChange"
               label-width="160px"
-              style="margin-bottom:20px"
+              style="margin-bottom: 20px"
             >
               <el-input v-model="form.titleChange"></el-input>
             </el-form-item>
@@ -158,7 +158,7 @@
               </div>
             </el-form-item>
           </div>
-          <div v-show="tabActive == 'two'">
+          <div v-if="AssesComSHow" v-show="tabActive == 'two'">
             <AddAssess :childScaleData="scaleData" ref="assessRef" />
           </div>
         </el-form>
@@ -418,8 +418,8 @@ export default {
   methods: {
     tabActiveChange(type) {
       this.tabActive = type;
-      if(type=='two'){
-        this.$refs.assessRef.resizeTable()
+      if (type == "two") {
+        this.$refs.assessRef.resizeTable();
       }
     },
     handleClear() {
@@ -634,11 +634,12 @@ export default {
         it = null;
       let outIsVia = true; // 外层验证是否通过
 
-      let validate = new Promise((resolve, reject) => {
+      let fvalidate = new Promise((resolve, reject) => {
         //wanglei 添加promise
         this.$refs.groups.validate((valid) => {
           if (!valid) {
-            reject();
+            console.log("ffffff");
+            reject("f");
             return false;
           } else {
             resolve();
@@ -647,14 +648,21 @@ export default {
       });
 
       // 三个表单校验，需全部通过后让goOn outIsVia 为true;
-      let all = [validate];
+      let all = [fvalidate];
       if (this.$refs.assessRef) {
-        all.push(...this.$refs.assessRef.assessCommit());
+        // all.push(...this.$refs.assessRef.assessCommit());
+        console.log("??????");
+        all = [...this.$refs.assessRef.assessCommit(), fvalidate];
       }
       await Promise.all(all)
-        .then(() => {
-        })
-        .catch(() => {
+        .then(() => {})
+        .catch((err) => {
+          // console.log("err", err);
+          // if (err == "f") {
+          //   this.tabActive = "one";
+          // } else if (err == "c") {
+          //   this.tabActive = "two";
+          // }
           goOn = false;
           outIsVia = false;
         });
@@ -744,7 +752,7 @@ export default {
         param.scale = assessParam;
         param.scale.conceptId = this.toAssesTermId;
         const userInfo = localStorage.getItem("userLoginDTO");
-        param.scale.modifier = userInfo.linkman; 
+        param.scale.modifier = userInfo.linkman;
       }
 
       // console.log("param-------");
@@ -1015,7 +1023,7 @@ export default {
 }
 .container_top {
   display: flex;
-  padding: 10px 30px;
+  padding: 20px 30px;
   align-items: center;
 }
 .tabs {