Merge branch 'product' of git.mes123.com:zhouyx/mes-ui into product-rjt

pages/materiel/masterData/add.vue

 <template>
   <div>
-    <Form ref="form" :model="entity" :rules="rules" :label-width="90">
+    <Form ref="form" :model="entity"  :label-width="90">
       <Row>
         <Col :span="12">
-          <FormItem label="名称" prop="name">
+          <FormItem label="名称" prop="name" :rules="{required: true, message: '必填', trigger: 'blur'}">
             <Input v-model="entity.name" placeholder="请输入"></Input>
           </FormItem>
         </Col>
@@ -37,7 +37,7 @@
       </div>
       <Row>
         <Col v-for="li in fileds" :key="li.field" :span="li.span">
-          <FormItem :label="li.title" :prop="li.name">
+          <FormItem :label="li.title" :prop="li.field" :rules="li.required?{required: true, message: '必填', trigger: 'blur'}:''">
             <Input v-if="li.dataType==0" v-model="entity[li.field]"></Input>
             <InputNumber
               v-if="li.dataType==1||li.dataType==2"