修改校验

smart-office-manager-ui/admin/src/views/room/drawershow.vue

@@ -42,6 +42,13 @@
             this.changePath("room")
         },
         data() {
+            let validatorSheet = (rule, value, callback)=>{
+                if(this.deviceIds.length<1){
+                    callback(new Error('请选择关联设备'))
+                }else{
+                    callback()
+                }
+            }
             return {
               fileType:['png', 'jpg', 'jpeg'],
               roomDeviceList: [],
@@ -69,9 +76,9 @@
                     roomType: [
                         {required: true,message: "请输入房间类型", trigger: "blur" },
                     ],
-                  deviceId: [
-                    {required: true,message: "请选择关联设备", trigger: "blur" },
-                  ],
+                    deviceId: [
+                        {required: true,message: "请选择关联设备", trigger: "blur" ,validator: validatorSheet},
+                    ],
                     createTime: [
                         {required: true,message: "请选择创建时间" },
                     ],
@@ -131,7 +138,6 @@
 
           beforeSubmit(data) {
            // data.deviceName=this.dict.deviceId[data.deviceId]
-            console.log(this.deviceIds)
             let roomDeviceList=this.deviceIds.map(i=>{
               let obj={}
               obj.deviceId=i

smart-office-manager-ui/admin/src/views/workman/drawershow.vue

@@ -27,8 +27,11 @@
                   :fileName="form.photoPath"
               /></Field>
               <Field  :span="20" label="党员示范logo" ><fileUpload v-model="form.filePath"  :fileType="fileType" :fileName="form.fileName"   @getFileName="getFileName" prePath="/file/fileupload"/></Field>
-
-              <Field label="排序值" type="num" prop="order" v-model="form.order" placeholder="请输入排序，值越大越靠前"/>
+                
+                <Field label="排序值" :span="20">
+                <Field type="num" prop="order" v-model="form.order" placeholder="请输入排序，值越大越靠前"/>
+                  <div>请输入排序，值越大越靠前</div>
+                </Field>
             </el-row>
 
             <form-buttons @submit='submitForm' v-if="pageInfo.type!='view'" noCancelBtn />
@@ -49,6 +52,28 @@
             this.changePath("workman")
         },
         data() {
+          let mobileReg = (rule, value, callback) =>{
+            if(!value){
+              callback(new Error('请输入电话号码'))
+            }
+            let regExp=/^(0\d{2,3}\-)?([2-9]\d{6,7})+(\-\d{1,6})?$/;
+              if(regExp.test(value)){
+                callback()
+              }else{
+                callback(new Error('请输入正确格式的电话号码'))
+              }
+          }
+          let phoneReg = (rule, value, callback) =>{
+            if(!value){
+              callback(new Error('请输入手机号码'))
+            }
+            let regExp=/^(((\+86)|(\+86-))|((86)|(86\-))|((0086)|(0086\-)))?1[3|5|7|8]\d{9}$/;
+            if(regExp.test(value)){
+              callback()
+            }else{
+              callback(new Error('请输入正确格式的手机号码'))
+            }
+          }
             return {
               fileType:['png', 'jpg', 'jpeg'],
                 // 遮罩层
@@ -79,11 +104,11 @@
                     {required: true,message: "请选择人员所属房间", trigger: "blur" }
                   ],
                   phone: [
-                    {required: true,message: "请输入电话号码", trigger: "blur" },
+                    {required: true,trigger: "blur" ,validator:phoneReg },
                     {max: 64,message: "最多只能录入64个字符",trigger: "blur",},
                   ],
                   mobile: [
-                    {required: true,message: "请输入手机号码", trigger: "blur" },
+                    {required: true,trigger: "blur" ,validator:mobileReg},
                     {max: 64,message: "最多只能录入64个字符",trigger: "blur",},
                   ],
                     workStatus: [