#

src/components/pages/testPerson/examine/index.vue

@@ -151,6 +151,7 @@
 </template>
 
 <script>
+
 export default {
   data() {
     return {
@@ -197,10 +198,29 @@ export default {
     },
     // 提交
     Submit() {
-      if (this.allData.type == 2) {
+      // if (this.allData.type == 2) {
+      //   this.$message({
+      //     type: "info",
+      //     message: "您已提交过，请勿重复提交"
+      //   });
+      //   return;
+      // }
+      let judgeNum = 0;
+
+      this.PageBaseData.forEach(e => {
+        e.children.forEach(i => {
+          if (i.type == 1) {
+            if (!i.sco1) {
+              judgeNum = 1;
+            }
+          }
+        });
+      });
+
+      if (judgeNum != 0) {
         this.$message({
-          type: "info",
-          message: "您已提交过，请勿重复提交"
+          message: "请将【自评】分数列填写完整后再提交。",
+          type: "warning"
         });
         return;
       }
@@ -408,7 +428,8 @@ export default {
   width: 100%;
   min-width: calc(100px * 10);
   min-height: 100%;
-  overflow-x: scroll;
+  /* overflow-x: scroll; */
+  overflow: auto;
   padding: 10px;
   box-sizing: border-box;
   background-color: #fff;
@@ -452,7 +473,9 @@ export default {
   padding: 5px;
   box-sizing: border-box;
   border-radius: 4px;
-  border: 1px solid #dcdfe6 !important;
+  border: none !important;
+
+  /* border: 1px solid #dcdfe6 !important; */
 }
 .teaLis {
   display: flex;
@@ -663,6 +686,9 @@ input[type="number"] {
 .ColCon {
   flex: 1;
 }
+.ColCon:nth-child(-1) > div {
+  border-bottom: none;
+}
 .twoCon > div > textarea {
   border: none;
   width: 100%;

src/components/pages/testPerson/test/test.vue

@@ -279,6 +279,9 @@ export default {
                 .get(this.$store.state.api + "selectTestExamineBase", params)
                 .then(res => {
                     this.ExamineBase = res.data[0]
+                    if ( this.ExamineBase.length > 0) {
+                        this.type=1
+                    }
                     // console.log("selectTestExamineBase", res.data);
                 })
                 .catch(error => {