From 5d681a5c48d6b09b7bc053795760fa8030f5f1cf Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期五, 15 九月 2023 14:24:59 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.22:9001/r/mom-before

---
 src/components/view/rawInsDetail.vue |   19 +++++++++++++++++--
 1 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/src/components/view/rawInsDetail.vue b/src/components/view/rawInsDetail.vue
index 4b6009a..13741d8 100644
--- a/src/components/view/rawInsDetail.vue
+++ b/src/components/view/rawInsDetail.vue
@@ -427,14 +427,15 @@
   },
   methods: {
     assertTest(row){
-      if(!/^[^><=]/.test(row.required)){
+      let fuArr=['>', '<', '=']
+      if(!fuArr.includes(row.required[0])){
         this.$message({
                     message: "鏍囧噯鍊糩"+row.required+"]鏍煎紡棣栦綅搴斿寘鍚�>,<鎴栬��=",
                     type: 'warning'
                 });
                 return
       }
-      if(!/^[^><=]/.test(row.internal)){
+      if(!fuArr.includes(row.internal[0])){
         this.$message({
                     message: "鍐呮帶鍊糩"+row.internal+"]鏍煎紡棣栦綅搴斿寘鍚�>,<鎴栬��=",
                     type: 'warning'
@@ -474,6 +475,20 @@
     },
     // 鏂板妫�楠屽崟
     async addNewRawInspect() {
+      //TODO:
+      console.log(this.projectTable);
+      if(this.projectTable.length>0){
+        let filterTable= this.projectTable.filter(item=>{
+        return item.required===''||item.internal===''||item.required===null||item.internal===null
+        })
+        if(filterTable.length>0) {
+          this.$message({
+                    message: "鏍囧噯鍊煎拰鍐呮帶鍊间笉鑳戒负绌猴紒",
+                    type: 'warning'
+                });
+          return
+        }
+      }
       this.projectTable.forEach(i => {
         // 灏嗗垪琛ㄨ浆鎹负瀛楃涓�
         i.testValue = i.testValueList.join(",");

--
Gitblit v1.9.3