Merge remote-tracking branch 'origin/main'

src/views/inspection/inspectionobjectDetail.vue

@@ -182,18 +182,29 @@ export default {
     this.SearchDetail();
   },
   methods: {
+    // handleFormSubmit() {
+    //   const form = this.$refs.form;
+    //   form.validate((valid) => {
+    //     if (valid) {
+    //       this.Submit();
+    //     } else {
+    //       this.$message({
+    //         type: "warning",
+    //         message: "请输入必要信息!"
+    //       });
+    //     }
+    //   });
+    // },
     handleFormSubmit() {
-      const form = this.$refs.form;
+      this.$refs.form.validate((valid, done, msg) => {
-      form.validate((valid) => {
         if (valid) {
+          done()
           this.Submit();
         } else {
-          this.$message({
+          console.log('error submit!!');
-            type: "warning",
+          return false;
-            message: "请输入必要信息!"
-          });
         }
-      });
+      })
     },
     // 处理表单提交
     Submit() {

src/views/leger/equipmentledgerDetail.vue

@@ -674,17 +674,15 @@
     },
     methods: {
       handleFormSubmit() {
-        const form = this.$refs.tab1_form;
+        this.$refs.form.validate((valid, done, msg) => {
-        form.validate((valid) => {
           if (valid) {
+            done()
             this.Submit();
           } else {
-            this.$message({
+            console.log('error submit!!');
-              type: "warning",
+            return false;
-              message: "请输入必要信息!"
-            });
           }
-        });
+        })
       },
       // 处理表单提交
       Submit() {

src/views/leger/toolinventoryrecordDetail.vue

@@ -509,23 +509,16 @@ export default {
     }
   },
   methods: {
-    handleTabChange(column) {
-      // activeTab 可能是当前激活的 Tab 的索引或标题
-      alert('当前激活的 Tab:', column.prop);
-      // 你可以在这里执行更多的逻辑
-    },
     handleFormSubmit() {
-      const form = this.$refs.tab1_form;
+      this.$refs.form.validate((valid, done, msg) => {
-      form.validate((valid) => {
         if (valid) {
+          done()
           this.Submit();
         } else {
-          this.$message({
+          console.log('error submit!!');
-            type: "warning",
+          return false;
-            message: "请输入必要信息!"
-          });
         }
-      });
+      })
     },
     // 处理表单提交
     Submit() {