合并

VUECODE/smart-operate-manage/src/views/phoneconfig/phoneconfigAdd.vue

@@ -11,7 +11,7 @@
         <el-input v-model="ruleForm.remark" placeholder="备注"/>
       </el-form-item>
       <el-form-item>
-        <el-button type="primary" @click="operateAdd()">添加</el-button>
+        <el-button type="primary" @click="operateAdd('ruleForm')">添加</el-button>
       </el-form-item>
     </el-form>
   </div>
@@ -40,8 +40,7 @@ export default {
           { required: true, message: '请输入名称', trigger: 'blur' }
         ],
         tel: [
-          { required: true, message: '请输入手机号', trigger: 'blur' },
-          { min: 6, max: 11, required: true, message: '请输入11位手机号、400号码或类似025123456固话号码', trigger: 'blur' }
+          {required: true, min: 6, max: 11, required: true, message: '请输入11位手机号、400号码或类似025123456固话号码', trigger: 'blur' }
         ],
         remark: [
           { required: false, message: '请输入备注', trigger: 'blur' }
@@ -52,8 +51,11 @@ export default {
   mounted() {
   },
   methods: {
-    operateAdd() {
-      this.$store.dispatch('OperateAdd', this.ruleForm).then((res) => {
+    operateAdd(formName) {
+
+    this.$refs[formName].validate((valid) => {
+          if (valid) {
+          this.$store.dispatch('OperateAdd', this.ruleForm).then((res) => {
         if (res.code === '0') {
           this.$message({
             message: '操作成功',
@@ -66,8 +68,22 @@ export default {
       }).catch(() => {
         console.log('error OperateAdd')
       })
+          } else {
+            console.log('error submit!!');
+            return false;
+          }
+        });
+      },
+      resetForm(formName) {
+        this.$refs[formName].resetFields();
+      }
     }
-  }
+
+
+
+
+
+      
 }
 </script>
 

VUECODE/smart-operate-manage/src/views/phoneconfig/phoneedit.vue

@@ -11,7 +11,7 @@
         <el-input v-model="ruleForm.remark" placeholder="备注"/>
       </el-form-item>
       <el-form-item>
-        <el-button type="primary" @click="editPhone()">提交</el-button>
+        <el-button type="primary" @click="editPhone('ruleForm')">提交</el-button>
       </el-form-item>
     </el-form>
   </div>
@@ -40,7 +40,7 @@ export default {
           { required: true, message: '请输入名称', trigger: 'blur' }
         ],
         tel: [
-          { required: true, message: '请输入手机号', trigger: 'blur' }
+          {required: true, min: 6, max: 11, required: true, message: '请输入11位手机号、400号码或类似025123456固话号码', trigger: 'blur' }
         ],
         remark: [
           { required: false, message: '请输入备注', trigger: 'blur' }
@@ -64,8 +64,12 @@ export default {
         console.log('error getOperateId')
       })
     },
-    editPhone() {
-      this.$store.dispatch('Phoneedit', this.ruleForm).then((res) => {
+    
+    editPhone(formName) {
+
+        this.$refs[formName].validate((valid) => {
+          if (valid) {
+             this.$store.dispatch('Phoneedit', this.ruleForm).then((res) => {
         if (res.code === '0') {
           this.$message({
             message: '修改成功',
@@ -77,9 +81,17 @@ export default {
         }
       }).catch(() => {
         console.log('error Phoneedit')
-      })
+      })           
+          } else {
+            console.log('error submit!!');
+            return false;
+          }
+        });
+      },
+      resetForm(formName) {
+        this.$refs[formName].resetFields();
+      }
     }
-  }
 }
 </script>