Authored by 王涛

#744 乙方运维-个人基本信息标记界面优化

@@ -32,30 +32,13 @@ @@ -32,30 +32,13 @@
32 </el-radio-group> 32 </el-radio-group>
33 </el-form-item> 33 </el-form-item>
34 </el-col> 34 </el-col>
35 - <el-col :span="8">  
36 - <el-form-item label="年龄" prop="age" class="form-class">  
37 - <el-input v-model="ruleForm.age" type="number" :readonly="isAdmin()"></el-input>  
38 - </el-form-item>  
39 - </el-col>  
40 - </el-row>  
41 35
42 -  
43 - <el-row :gutter="5">  
44 - <el-col :span="8">  
45 - <el-form-item label="座机号码" prop="tel" class="form-class">  
46 - <el-input v-model="ruleForm.tel" :readonly="isAdmin()"></el-input>  
47 - </el-form-item>  
48 - </el-col>  
49 <el-col :span="8"> 36 <el-col :span="8">
50 <el-form-item label="手机号" prop="phone" class="form-class"> 37 <el-form-item label="手机号" prop="phone" class="form-class">
51 <el-input v-model="ruleForm.phone" :readonly="isAdmin()"></el-input> 38 <el-input v-model="ruleForm.phone" :readonly="isAdmin()"></el-input>
52 </el-form-item> 39 </el-form-item>
53 </el-col> 40 </el-col>
54 - <el-col :span="8">  
55 - <el-form-item label="电子邮箱" prop="email" class="form-class">  
56 - <el-input v-model="ruleForm.email" id="email" :readonly="isAdmin()"></el-input>  
57 - </el-form-item>  
58 - </el-col> 41 +
59 </el-row> 42 </el-row>
60 43
61 <el-row :gutter="5"> 44 <el-row :gutter="5">
@@ -247,10 +247,8 @@ export default { @@ -247,10 +247,8 @@ export default {
247 247
248 let ruleForm = Vue.ref({ 248 let ruleForm = Vue.ref({
249 nickname: '', 249 nickname: '',
250 - sex: 0,  
251 education: '', 250 education: '',
252 phone: '', 251 phone: '',
253 - email: '',  
254 entryTime: '', 252 entryTime: '',
255 certificate: '', 253 certificate: '',
256 university: '', 254 university: '',
@@ -261,7 +259,6 @@ export default { @@ -261,7 +259,6 @@ export default {
261 projectId: null, 259 projectId: null,
262 quitTime: '', 260 quitTime: '',
263 state: '', 261 state: '',
264 - tel: '',  
265 idcard:'', 262 idcard:'',
266 politicsStatus:'' 263 politicsStatus:''
267 }) 264 })
@@ -311,38 +308,19 @@ export default { @@ -311,38 +308,19 @@ export default {
311 * @returns {*} 308 * @returns {*}
312 */ 309 */
313 const checkPhone= (rule, tel, callback) => { 310 const checkPhone= (rule, tel, callback) => {
314 - var mobile = /^1[3|5|8]\d{9}$/;  
315 - if (!mobile.test(tel)) {  
316 - return callback(new Error('请输入正确的手机号!'))  
317 - }else{ 311 + var mobile = /^1[0-9]\d{9}$/;
  312 + if (tel != '' && !mobile.test(tel)) {
  313 + callback(new Error('请输入正确的手机号!'))
  314 + } else {
318 callback(); 315 callback();
319 } 316 }
320 } 317 }
321 - /**  
322 - * @Author LH  
323 - * @param rule  
324 - * @param value  
325 - * @param callback  
326 - * @returns {*}  
327 - */  
328 - const checkEmail= (rule, tel, callback) => {  
329 - var reg = new RegExp("^[a-z0-9]+([._\\-]*[a-z0-9])*@([a-z0-9]+[-a-z0-9]*[a-z0-9]+.){1,63}[a-z0-9]+$"); //正则表达式  
330 - var obj = document.getElementById("email"); //要验证的对象  
331 - if(obj.value === ""){ //输入不能为空  
332 - //return callback(new Error('邮箱不能为空!'));  
333 - callback()  
334 - }else if(!reg.test(obj.value)){ //正则验证不通过,格式不对  
335 - return callback(new Error('邮箱格式不正确!'));  
336 - }else{  
337 - callback()  
338 - }  
339 - }  
340 const checkIdCard=(rule, idCard, callback) => { 318 const checkIdCard=(rule, idCard, callback) => {
341 var pattern = /(^\d{15}$)|(^\d{18}$)|(^\d{17}(\d|X|x)$)/; 319 var pattern = /(^\d{15}$)|(^\d{18}$)|(^\d{17}(\d|X|x)$)/;
342 - if (pattern.test(idCard)) {  
343 - callback()  
344 - }else{  
345 - return callback(new Error('身份证校验失败!')); 320 + if (idCard != '' && !pattern.test(idCard)) {
  321 + callback(new Error('身份证校验失败!'));
  322 + } else {
  323 + callback();
346 } 324 }
347 } 325 }
348 326
@@ -357,14 +335,11 @@ export default { @@ -357,14 +335,11 @@ export default {
357 phone: [ 335 phone: [
358 { validator: checkPhone, trigger: 'blur' } 336 { validator: checkPhone, trigger: 'blur' }
359 ], 337 ],
360 - email: [  
361 - { validator: checkEmail, trigger: 'blur' }  
362 - ],  
363 company: [ 338 company: [
364 { message:'请输入所在公司', trigger: 'blur' } 339 { message:'请输入所在公司', trigger: 'blur' }
365 ], 340 ],
366 idcard: [ 341 idcard: [
367 - { validator:checkIdCard,message:'请输入身份证号', trigger: 'blur' } 342 + { validator:checkIdCard,message:'请输入正确的身份证号', trigger: 'blur'}
368 ], 343 ],
369 entryTime: [ 344 entryTime: [
370 { message: '请选择入职时间', trigger: 'blur' }, 345 { message: '请选择入职时间', trigger: 'blur' },
@@ -378,21 +353,21 @@ export default { @@ -378,21 +353,21 @@ export default {
378 */ 353 */
379 // 保存用户信息 354 // 保存用户信息
380 let saveUser = () => { 355 let saveUser = () => {
381 - proxy.$refs.rule.validate((valid) => {  
382 - if (valid) {  
383 - console.log('submit!!');  
384 - proxy.$http.post("/api-web/bOpsPerson/saveOrUpdate", ruleForm.value, function (res) {  
385 - if (res && res.code == 0) {  
386 - proxy.$global.showMsg('保存成功!');  
387 - }  
388 - });  
389 - } else {  
390 - console.log('error submit!!');  
391 - return false;  
392 - }  
393 - }); 356 + proxy.$refs.rule.validate((valid) => {
  357 + if (valid) {
  358 + console.log('submit!!');
  359 + proxy.$http.post("/api-web/bOpsPerson/saveOrUpdate", ruleForm.value, function (res) {
  360 + if (res && res.code == 0) {
  361 + proxy.$global.showMsg('保存成功!');
  362 + }
  363 + });
  364 + } else {
  365 + console.log('error submit!!');
  366 + return false;
  367 + }
  368 + });
394 369
395 - } 370 + }
396 371
397 372
398 let getFile = (param) => { 373 let getFile = (param) => {