基础信息表单校验

src/components/person-tags/aids-form.vue

@@ -17,6 +17,7 @@
   import {DIC} from "@/api/util/nation"
   import {update} from "@/api/person/basicinfo";
   import {update as aidsUpdate,addAids} from "@/api/person/aids";
+  import {validatePhone} from "../../util/validator";
   export default {
     name: "aids-form",
     props:{
@@ -218,6 +219,8 @@
               rules: [{
                 required: true,
                 message: "请输入手机号码",
+              },{
+                validator: validatePhone,
                 trigger: "blur"
               }]
             },

src/components/person-tags/allowancespeople-form.vue

@@ -4,7 +4,11 @@
       <el-tab-pane label="基础信息" name="first"></el-tab-pane>
       <el-tab-pane label="低保人员" name="second"></el-tab-pane>
     </el-tabs>
-        <avue-form v-show="activeName=='first'" :option="optionBasic" v-model="formBasic"></avue-form>
+        <avue-form v-show="activeName=='first'" :option="optionBasic" v-model="formBasic">
+          <template slot-scope="scope" slot="menuForm">
+            <el-button type="primary" @click="nextStep">下一步</el-button>
+          </template>
+        </avue-form>
         <avue-form v-show="activeName=='second'" :option="optionAllowance" v-model="formAllowance" @submit="addEntity"></avue-form>
   </basic-container>
 </template>
@@ -215,6 +219,8 @@
                   rules: [{
                     required: true,
                     message: "请输入手机号码",
+                  },{
+                    validator: validatePhone,
                     trigger: "blur"
                   }]
                 },
@@ -249,7 +255,7 @@
                   // searchFilterable:true,
                   hide:true,
                   rules: [{
-                    required: true,
+                    required: false,
                     message: "请输入民族",
                     trigger: "blur"
                   }]
@@ -507,6 +513,18 @@
           }
       },
       methods:{
+        nextStep(){
+          if (!this.validatenull(this.formBasic.name) && !this.validatenull(this.formBasic.sex) && !this.validatenull(this.formBasic.agencyId) && !this.validatenull(this.formBasic.residentialId)
+            && !this.validatenull(this.formBasic.buildingId) && !this.validatenull(this.formBasic.floorId) && !this.validatenull(this.formBasic.unitId)
+            && !this.validatenull(this.formBasic.roomId) && !this.validatenull(this.formBasic.phone)){
+            this.activeName='second';
+          }else {
+            this.$message({
+              type: "warning",
+              message: "请先完善当前界面信息!"
+            })
+          }
+        },
           addEntity(){
             //新增
             if (this.tag==1){

src/components/person-tags/correctionalStaff-form.vue

@@ -17,6 +17,7 @@
   import {DIC} from "@/api/util/nation"
   import {update} from "@/api/person/basicinfo";
   import {update as correctionalStaffUpdate,addCorrectionalStaff} from "@/api/person/correctionalstaff";
+  import {validatePhone} from "../../util/validator";
   export default {
     name: "correctionalStaff-form",
     props:{
@@ -216,6 +217,8 @@
               rules: [{
                 required: true,
                 message: "请输入手机号码",
+              },{
+                validator:validatePhone,
                 trigger: "blur"
               }]
             },
@@ -839,7 +842,16 @@
     },
     methods:{
       nextStep(){
-        this.activeName='second';
+        if (!this.validatenull(this.formBasic.name) && !this.validatenull(this.formBasic.sex) && !this.validatenull(this.formBasic.agencyId) && !this.validatenull(this.formBasic.residentialId)
+          && !this.validatenull(this.formBasic.buildingId) && !this.validatenull(this.formBasic.floorId) && !this.validatenull(this.formBasic.unitId)
+          && !this.validatenull(this.formBasic.roomId) && !this.validatenull(this.formBasic.phone)){
+          this.activeName='second';
+        }else {
+          this.$message({
+            type: "warning",
+            message: "请先完善当前界面信息!"
+          })
+        }
       },
       addEntity(){
         //新增

src/components/person-tags/disabler-form.vue

@@ -4,7 +4,11 @@
       <el-tab-pane label="基础信息" name="first"></el-tab-pane>
       <el-tab-pane label="残障人士信息" name="second"></el-tab-pane>
     </el-tabs>
-    <avue-form v-show="activeName=='first'" :option="optionBasic" v-model="formBasic"></avue-form>
+    <avue-form v-show="activeName=='first'" :option="optionBasic" v-model="formBasic">
+      <template slot-scope="scope" slot="menuForm">
+        <el-button type="primary" @click="nextStep">下一步</el-button>
+      </template>
+    </avue-form>
     <avue-form v-show="activeName=='second'" :option="optionDisabler" v-model="formDisabler" @submit="addEntity"></avue-form>
   </basic-container>
 </template>
@@ -215,6 +219,8 @@
               rules: [{
                 required: true,
                 message: "请输入手机号码",
+              },{
+                validator:validatePhone,
                 trigger: "blur"
               }]
             },
@@ -590,6 +596,18 @@
       }
     },
     methods:{
+      nextStep(){
+        if (!this.validatenull(this.formBasic.name) && !this.validatenull(this.formBasic.sex) && !this.validatenull(this.formBasic.agencyId) && !this.validatenull(this.formBasic.residentialId)
+          && !this.validatenull(this.formBasic.buildingId) && !this.validatenull(this.formBasic.floorId) && !this.validatenull(this.formBasic.unitId)
+          && !this.validatenull(this.formBasic.roomId) && !this.validatenull(this.formBasic.phone)){
+          this.activeName='second';
+        }else {
+          this.$message({
+            type: "warning",
+            message: "请先完善当前界面信息!"
+          })
+        }
+      },
       addEntity(){
         //新增
         if (this.tag==1){

src/components/person-tags/elderlyPeople-form.vue

@@ -4,7 +4,11 @@
       <el-tab-pane label="基础信息" name="first"></el-tab-pane>
       <el-tab-pane label="高龄老人信息" name="second"></el-tab-pane>
     </el-tabs>
-    <avue-form v-show="activeName=='first'" :option="optionBasic" v-model="formBasic"></avue-form>
+    <avue-form v-show="activeName=='first'" :option="optionBasic" v-model="formBasic">
+      <template slot-scope="scope" slot="menuForm">
+        <el-button type="primary" @click="nextStep">下一步</el-button>
+      </template>
+    </avue-form>
     <avue-form v-show="activeName=='second'" :option="optionElderlypeople" v-model="formElderlyPeople" @submit="addEntity"></avue-form>
   </basic-container>
 </template>
@@ -215,6 +219,9 @@
               rules: [{
                 required: true,
                 message: "请输入手机号码",
+
+              },{
+                validator: validatePhone,
                 trigger: "blur"
               }]
             },
@@ -565,6 +572,18 @@
       }
     },
     methods:{
+      nextStep(){
+        if (!this.validatenull(this.formBasic.name) && !this.validatenull(this.formBasic.sex) && !this.validatenull(this.formBasic.agencyId) && !this.validatenull(this.formBasic.residentialId)
+          && !this.validatenull(this.formBasic.buildingId) && !this.validatenull(this.formBasic.floorId) && !this.validatenull(this.formBasic.unitId)
+          && !this.validatenull(this.formBasic.roomId) && !this.validatenull(this.formBasic.phone)){
+          this.activeName='second';
+        }else {
+          this.$message({
+            type: "warning",
+            message: "请先完善当前界面信息!"
+          })
+        }
+      },
       addEntity(){
         //新增
         if (this.tag==1){

src/components/person-tags/establishFilecard-form.vue

@@ -4,7 +4,11 @@
       <el-tab-pane label="基础信息" name="first"></el-tab-pane>
       <el-tab-pane label="建档立卡信息" name="second"></el-tab-pane>
     </el-tabs>
-    <avue-form v-show="activeName=='first'" :option="optionBasic" v-model="formBasic"></avue-form>
+    <avue-form v-show="activeName=='first'" :option="optionBasic" v-model="formBasic">
+      <template slot-scope="scope" slot="menuForm">
+        <el-button type="primary" @click="nextStep">下一步</el-button>
+      </template>
+    </avue-form>
     <avue-form v-show="activeName=='second'" :option="optionEstablishFilecard" v-model="formEstablishFilecard" @submit="addEntity"></avue-form>
   </basic-container>
 </template>
@@ -213,6 +217,8 @@
               rules: [{
                 required: true,
                 message: "请输入手机号码",
+              },{
+                validator: validatePhone,
                 trigger: "blur"
               }]
             },
@@ -593,6 +599,18 @@
       }
     },
     methods:{
+      nextStep(){
+        if (!this.validatenull(this.formBasic.name) && !this.validatenull(this.formBasic.sex) && !this.validatenull(this.formBasic.agencyId) && !this.validatenull(this.formBasic.residentialId)
+          && !this.validatenull(this.formBasic.buildingId) && !this.validatenull(this.formBasic.floorId) && !this.validatenull(this.formBasic.unitId)
+          && !this.validatenull(this.formBasic.roomId) && !this.validatenull(this.formBasic.phone)){
+          this.activeName='second';
+        }else {
+          this.$message({
+            type: "warning",
+            message: "请先完善当前界面信息!"
+          })
+        }
+      },
       addEntity(){
         //新增
         if (this.tag==1){

src/components/person-tags/fertileWoman-form.vue

@@ -4,7 +4,11 @@
       <el-tab-pane label="基础信息" name="first"></el-tab-pane>
       <el-tab-pane label="育龄妇女信息" name="second"></el-tab-pane>
     </el-tabs>
-    <avue-form v-show="activeName=='first'" :option="optionBasic" v-model="formBasic"></avue-form>
+    <avue-form v-show="activeName=='first'" :option="optionBasic" v-model="formBasic">
+      <template slot-scope="scope" slot="menuForm">
+        <el-button type="primary" @click="nextStep">下一步</el-button>
+      </template>
+    </avue-form>
     <avue-form v-show="activeName=='second'" :option="optionFertileWomen" v-model="formFertileWomen" @submit="addEntity"></avue-form>
   </basic-container>
 </template>
@@ -13,6 +17,7 @@
   import {DIC} from "@/api/util/nation"
   import {update} from "@/api/person/basicinfo";
   import {update as fertileWomanUpdate,addFertileWoman} from "@/api/person/fertilewoman";
+  import {validatePhone} from "../../util/validator";
   export default {
     name: "fertileWoman-form",
     props:{
@@ -214,6 +219,8 @@
               rules: [{
                 required: true,
                 message: "请输入手机号码",
+              },{
+                validator: validatePhone,
                 trigger: "blur"
               }]
             },
@@ -560,6 +567,18 @@
       }
     },
     methods:{
+      nextStep(){
+        if (!this.validatenull(this.formBasic.name) && !this.validatenull(this.formBasic.sex) && !this.validatenull(this.formBasic.agencyId) && !this.validatenull(this.formBasic.residentialId)
+          && !this.validatenull(this.formBasic.buildingId) && !this.validatenull(this.formBasic.floorId) && !this.validatenull(this.formBasic.unitId)
+          && !this.validatenull(this.formBasic.roomId) && !this.validatenull(this.formBasic.phone)){
+          this.activeName='second';
+        }else {
+          this.$message({
+            type: "warning",
+            message: "请先完善当前界面信息!"
+          })
+        }
+      },
       addEntity(){
         //新增
         if (this.tag==1){

src/components/person-tags/prisoner-form.vue

@@ -17,6 +17,7 @@
   import {DIC} from "@/api/util/nation"
   import {update} from "@/api/person/basicinfo";
   import {update as prisonerUpdate,addPrisoner} from "@/api/person/prisoner";
+  import {validatePhone} from "../../util/validator";
   export default {
     name: "prisoner-form",
     props:{
@@ -216,6 +217,8 @@
               rules: [{
                 required: true,
                 message: "请输入手机号码",
+              },{
+                validator: validatePhone,
                 trigger: "blur"
               }]
             },
@@ -657,7 +660,16 @@
     },
     methods:{
       nextStep(){
-        this.activeName='second';
+        if (!this.validatenull(this.formBasic.name) && !this.validatenull(this.formBasic.sex) && !this.validatenull(this.formBasic.agencyId) && !this.validatenull(this.formBasic.residentialId)
+          && !this.validatenull(this.formBasic.buildingId) && !this.validatenull(this.formBasic.floorId) && !this.validatenull(this.formBasic.unitId)
+          && !this.validatenull(this.formBasic.roomId) && !this.validatenull(this.formBasic.phone)){
+          this.activeName='second';
+        }else {
+          this.$message({
+            type: "warning",
+            message: "请先完善当前界面信息!"
+          })
+        }
       },
       addEntity(){
         //新增

src/components/person-tags/psychiatric-form.vue

@@ -17,6 +17,7 @@
   import {DIC} from "@/api/util/nation"
   import {update} from "@/api/person/basicinfo";
   import {update as psychiatricUpdate,addPsychiatric} from "@/api/person/psychiatric";
+  import {validatePhone} from "../../util/validator";
   export default {
     name: "psychiatric-form",
     props:{
@@ -216,6 +217,8 @@
               rules: [{
                 required: true,
                 message: "请输入手机号码",
+              },{
+                validator: validatePhone,
                 trigger: "blur"
               }]
             },
@@ -614,7 +617,16 @@
     },
     methods:{
       nextStep(){
-        this.activeName='second';
+        if (!this.validatenull(this.formBasic.name) && !this.validatenull(this.formBasic.sex) && !this.validatenull(this.formBasic.agencyId) && !this.validatenull(this.formBasic.residentialId)
+          && !this.validatenull(this.formBasic.buildingId) && !this.validatenull(this.formBasic.floorId) && !this.validatenull(this.formBasic.unitId)
+          && !this.validatenull(this.formBasic.roomId) && !this.validatenull(this.formBasic.phone)){
+          this.activeName='second';
+        }else {
+          this.$message({
+            type: "warning",
+            message: "请先完善当前界面信息!"
+          })
+        }
       },
       addEntity(){
         //新增

src/components/person-tags/veterans-form.vue

@@ -4,7 +4,11 @@
       <el-tab-pane label="基础信息" name="first"></el-tab-pane>
       <el-tab-pane label="退伍军人信息" name="second"></el-tab-pane>
     </el-tabs>
-    <avue-form v-show="activeName=='first'" :option="optionBasic" v-model="formBasic"></avue-form>
+    <avue-form v-show="activeName=='first'" :option="optionBasic" v-model="formBasic">
+      <template slot-scope="scope" slot="menuForm">
+        <el-button type="primary" @click="nextStep">下一步</el-button>
+      </template>
+    </avue-form>
     <avue-form v-show="activeName=='second'" :option="optionVeterans" v-model="formVeterans" @submit="addEntity"></avue-form>
   </basic-container>
 </template>
@@ -13,6 +17,7 @@
   import {DIC} from "@/api/util/nation"
   import {update} from "@/api/person/basicinfo";
   import {update as veteransUpdate,addVeterans} from "@/api/person/veterans";
+  import {validatePhone} from "../../util/validator";
   export default {
     name: "veterans-form",
     props:{
@@ -212,6 +217,8 @@
               rules: [{
                 required: true,
                 message: "请输入手机号码",
+              },{
+                validator: validatePhone,
                 trigger: "blur"
               }]
             },
@@ -548,6 +555,18 @@
       }
     },
     methods:{
+      nextStep(){
+        if (!this.validatenull(this.formBasic.name) && !this.validatenull(this.formBasic.sex) && !this.validatenull(this.formBasic.agencyId) && !this.validatenull(this.formBasic.residentialId)
+          && !this.validatenull(this.formBasic.buildingId) && !this.validatenull(this.formBasic.floorId) && !this.validatenull(this.formBasic.unitId)
+          && !this.validatenull(this.formBasic.roomId) && !this.validatenull(this.formBasic.phone)){
+          this.activeName='second';
+        }else {
+          this.$message({
+            type: "warning",
+            message: "请先完善当前界面信息!"
+          })
+        }
+      },
       addEntity(){
         //新增
         if (this.tag==1){