手机号正则限制修改

2c2c2c
1 parent 5f5703a9
Showing 9 changed files with 13 additions and 8 deletions
trash-garbage/src/main/java/com/trash/garbage/service/impl/GarOrderServiceImpl.java
trash-ui/src/api/leave.js
trash-ui/src/api/three_step.js
trash-ui/src/views/unit/disposalSite/info.vue
trash-ui/src/views/unit/disposalSite/infoEdit.vue
trash-ui/src/views/unit/driver/info.vue
trash-ui/src/views/unit/dropPointInfo/index.vue
trash-ui/src/views/unit/enterprise/info.vue
trash-ui/src/views/unit/enterprise/infoEdit.vue
@@ -1455,6 +1455,11 @@ public class GarOrderServiceImpl extends ServiceImpl&lt;GarOrderMapper, GarOrder&gt;
                 BeanUtils.copyProperties(dto, garOrderMatchAsk);
                 garOrderMatchAsk.setGarUpdateBy(dto.getGarOrderHandlerName());
                 garOrderMatchAsk.setGarUpdateTime(new Date());
+
+                if(!garOrderMatchAsk.getGarCarCode().equals(dto.getGarHandlerCarCode())){
+                    garOrderMatchAsk.setGarOrderType("1");
+                    garOrderMatchAsk.setGarRemark(garOrderMatchAsk.getGarRemark()!=null?garOrderMatchAsk.getGarRemark()+";装车和卸车的车辆号牌不一致":"装车和卸车的车辆号牌不一致");
+                }
                 garOrderAssociationServiceAsync.isWithinDisposal(dto.getGarHandlerCarCode(), garOrderMatchAsk, dto);
                 askService.updateById(garOrderMatchAsk);
                 // 保存图片url
@@ -65,7 +65,7 @@ export default {
         phone: [
           {required: true, message: '必填', trigger: 'change'},
           {
-            pattern: /^1(3|4|5|7|8|9)\d{9}$/,
+            pattern: /^1(3|4|5|6|7|8|9)\d{9}$/,
             message: '手机号格式错误',
             trigger: 'change'
           }
@@ -158,7 +158,7 @@ export default {
           trigger: 'change'
         },
           {
-            pattern: /^1(3|4|5|7|8|9)\d{9}$/,
+            pattern: /^1(3|4|5|6|7|8|9)\d{9}$/,
             message: '手机号格式错误',
             trigger: 'change'
           },
@@ -636,7 +636,7 @@ export default {
         constructionUnitPersonPhone: [
           { required: true, message: "请输入责任人联系电话", trigger: "blur" },
           {
-            pattern: /^1(3|4|5|7|8|9)\d{9}$/,
+            pattern: /^1(3|4|5|6|7|8|9)\d{9}$/,
             message: '手机号格式错误',
             trigger: 'change'
           }
@@ -692,7 +692,7 @@ export default {
         constructionUnitPersonPhone: [
           {required: true, message: "请输入责任人联系电话", trigger: "blur"},
           {
-            pattern: /^1(3|4|5|7|8|9)\d{9}$/,
+            pattern: /^1(3|4|5|6|7|8|9)\d{9}$/,
             message: '手机号格式错误',
             trigger: 'change'
           }
@@ -370,7 +370,7 @@ export default {
         phoneNo: [
           {required: true, message: "请输入手机号码", trigger: "blur"},
           {
-            pattern: /^1(3|4|5|7|8|9)\d{9}$/,
+            pattern: /^1(3|4|5|6|7|8|9)\d{9}$/,
             message: '手机号格式错误',
             trigger: 'change'
           }
@@ -415,7 +415,7 @@ export default {
         custodianPhone: [
           {required: true, message: "请输入管理员电话", trigger: "blur"},
           {
-            pattern: /^1(3|4|5|7|8|9)\d{9}$/,
+            pattern: /^1(3|4|5|6|7|8|9)\d{9}$/,
             message: '手机号格式错误',
             trigger: 'change'
           }
@@ -497,7 +497,7 @@ export default {
         servicePhone: [
           {required: true, message: "请输入企业服务手机号码", trigger: "blur"},
           {
-            pattern: /^1(3|4|5|7|8|9)\d{9}$/,
+            pattern: /^1(3|4|5|6|7|8|9)\d{9}$/,
             message: '手机号格式错误',
             trigger: 'change'
           }
@@ -497,7 +497,7 @@ export default {
         servicePhone: [
           {required: true, message: "请输入企业服务手机号码", trigger: "blur"},
           {
-            pattern: /^1(3|4|5|7|8|9)\d{9}$/,
+            pattern: /^1(3|4|5|6|7|8|9)\d{9}$/,
             message: '手机号格式错误',
             trigger: 'change'
           }