瀏覽代碼

更改手机号的匹配规则,解决添加公司失败的问题

wuqingchuimiexiaoshanhe 2 天之前
父節點
當前提交
b444ab7639

+ 1 - 1
src/components/waybillForm.vue

@@ -75,7 +75,7 @@
             message: '请输入电话',
             trigger: 'blur'
           }, {
-            pattern: /^((0\d{2,3}-\d{7,8})|(1[34578]\d{9}))$/,
+            pattern: /^(\+?86[ -]?)?(0\d{2,3}[ -]?)?\d{7,11}$/,
             message: '请输入正确手机号码',
             trigger: "blur"
           }],

+ 15 - 10
src/views/system/CompanyManagement.vue

@@ -114,6 +114,18 @@
           iceRaftManage: false,
           remark: '',
         },
+        defaultRuleForm: {
+          name: '',
+          appName: '',
+          companyCoordinate: '',
+          companyAddress: '',
+          coldKey: '',
+          isIceReleaseCold: false,
+          isCoolerReleaseCold: false,
+          isOutStorage: false,
+          iceRaftManage: false,
+          remark: '',
+        },
         confirmLoading: false,
 
         treeData: employee(),
@@ -228,6 +240,7 @@
           this.staffTitle = '添加子级'
           this.staffDialogVisible = true
           this.parentId = row.id
+          this.ruleForm = JSON.parse(JSON.stringify(this.defaultRuleForm))
         }
       },
       openModel(type) {
@@ -237,6 +250,7 @@
           this.staffTitle = '添加'
           this.staffDialogVisible = true
           this.operationType = type
+          this.ruleForm = JSON.parse(JSON.stringify(this.defaultRuleForm))
         }
       },
       // 打开导入公司对话框
@@ -386,16 +400,7 @@
       },
       // 清空表单
       closeDialog() {
-        // this.ruleForm = {}
-        this.ruleForm.name = ''
-        this.ruleForm.appName = ''
-        this.ruleForm.companyAddress = ''
-        this.ruleForm.coldKey = ''
-        this.ruleForm.isIceReleaseCold = false
-        this.ruleForm.isCoolerReleaseCold = false
-        this.ruleForm.isOutStorage = false
-        this.ruleForm.iceRaftManage = false
-        this.ruleForm.remark = ''
+        this.ruleForm = JSON.parse(JSON.stringify(this.defaultRuleForm))
         this.$refs.childRules.resetCheck();
       }
     }

+ 1 - 1
src/views/system/address.js

@@ -66,7 +66,7 @@ export const formRules = () => {
         message: '请输入电话号码',
         trigger: 'blur'
       }, {
-        pattern: /^((0\d{2,3}-\d{7,8})|(1[34578]\d{9}))$/,
+        pattern: /^(\+?86[ -]?)?(0\d{2,3}[ -]?)?\d{7,11}$/,
         message: '请输入正确手机号码',
         trigger: "blur"
       }]

+ 2 - 2
src/views/system/client.js

@@ -76,7 +76,7 @@ export const formRules = () => {
       message: '请输入手机号',
       trigger: 'blur'
     }, {
-      pattern: /^((0\d{2,3}-\d{7,8})|(1[34578]\d{9}))$/,
+      pattern: /^(\+?86[ -]?)?(0\d{2,3}[ -]?)?\d{7,11}$/,
       message: '请输入正确手机号码',
       trigger: "blur"
     }]
@@ -136,7 +136,7 @@ export const formRulesil = () => {
       message: '请输入手机号',
       trigger: 'blur'
     }, {
-      pattern: /^((0\d{2,3}-\d{7,8})|(1[34578]\d{9}))$/,
+      pattern: /^(\+?86[ -]?)?(0\d{2,3}[ -]?)?\d{7,11}$/,
       message: '请输入正确手机号码',
       trigger: "blur"
     }]

+ 2 - 2
src/views/system/interiorUserTable.js

@@ -107,7 +107,7 @@ export const formRules = () => {
         message: '请输入电话号码',
         trigger: 'blur'
       }, {
-        pattern: /^((0\d{2,3}-\d{7,8})|(1[34578]\d{9}))$/,
+        pattern: /^(\+?86[ -]?)?(0\d{2,3}[ -]?)?\d{7,11}$/,
         message: '请输入正确电话号码',
         trigger: "blur"
       }]
@@ -181,7 +181,7 @@ export const formRulesil = () => {
         message: '请输入电话号码',
         trigger: 'blur'
       }, {
-        pattern: /^((0\d{2,3}-\d{7,8})|(1[34578]\d{9}))$/,
+        pattern: /^(\+?86[ -]?)?(0\d{2,3}[ -]?)?\d{7,11}$/,
         message: '请输入正确电话号码',
         trigger: "blur"
       }]

+ 2 - 2
src/views/system/userTable.js

@@ -94,7 +94,7 @@ export const formRules = () => {
         message: '请输入电话号码',
         trigger: 'blur'
       }, {
-        pattern: /^((0\d{2,3}-\d{7,8})|(1[34578]\d{9}))$/,
+        pattern: /^(\+?86[ -]?)?(0\d{2,3}[ -]?)?\d{7,11}$/,
         message: '请输入正确电话号码',
         trigger: "blur"
       }]
@@ -168,7 +168,7 @@ export const formRulesil = () => {
         message: '请输入电话号码',
         trigger: 'blur'
       }, {
-        pattern: /^((0\d{2,3}-\d{7,8})|(1[34578]\d{9}))$/,
+        pattern: /^(\+?86[ -]?)?(0\d{2,3}[ -]?)?\d{7,11}$/,
         message: '请输入正确电话号码',
         trigger: "blur"
       }]