From be95736987abd8613bf11f9fdd7c0be96d78dbd9 Mon Sep 17 00:00:00 2001
From: yanran200730 <yanran200830@163.com>
Date: Wed, 26 Jan 2022 09:40:38 +0800
Subject: [PATCH] 26995

---
 .../AppConvenienceAddressBook/components/Add.vue  | 15 ++++++++++++++-
 .../AppConvenienceAddressBook/components/List.vue |  7 +++----
 2 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/packages/3.0.0/AppConvenienceAddressBook/components/Add.vue b/packages/3.0.0/AppConvenienceAddressBook/components/Add.vue
index 7866c6a5..97d1529e 100644
--- a/packages/3.0.0/AppConvenienceAddressBook/components/Add.vue
+++ b/packages/3.0.0/AppConvenienceAddressBook/components/Add.vue
@@ -17,7 +17,7 @@
             <el-form-item style="width: 100%" label="类型" prop="type" :rules="[{ required: true, message: '请输入类型', trigger: 'change' }]">
               <el-input size="small" placeholder="请输入类型" v-model="form.type"></el-input>
             </el-form-item>
-            <el-form-item style="width: 100%" label="电话" prop="phone" :rules="[{ required: true, message: '请输入电话', trigger: 'blur' }]">
+            <el-form-item style="width: 100%" label="电话" prop="phone" :rules="[{ validator: regPhone, message: '请输入电话', trigger: 'blur' }]">
               <el-input size="small" placeholder="请输入电话" show-word-limit maxlength="11" v-model="form.phone"></el-input>
             </el-form-item>
             <el-form-item style="width: 100%;" label="是否公开" prop="isPublic" :rules="[{ required: true, message: '请选择是否公开', trigger: 'change' }]">
@@ -48,6 +48,18 @@
     },
 
     data () {
+      var regPhone = (rule, value, callback) => {
+        if (!value) {
+          return callback(new Error('请输入电话'))
+        } else {
+          const reg = /^1[3|4|5|7|8][0-9]\d{8}$/
+          if (reg.test(value)) {
+            callback()
+          } else {
+            return callback(new Error('请输入正确的电话号码'))
+          }
+        }
+      }
       return {
         info: {},
         form: {
@@ -59,6 +71,7 @@
           type: '',
         },
         id: '',
+        regPhone,
         areaList: []
       }
     },
diff --git a/packages/3.0.0/AppConvenienceAddressBook/components/List.vue b/packages/3.0.0/AppConvenienceAddressBook/components/List.vue
index 76646bab..cdbebb78 100644
--- a/packages/3.0.0/AppConvenienceAddressBook/components/List.vue
+++ b/packages/3.0.0/AppConvenienceAddressBook/components/List.vue
@@ -61,7 +61,7 @@
         :current.sync="search.current"
         :size.sync="search.size"
         @getList="getList">
-        <el-table-column slot="isPublic" label="是否公开">
+        <el-table-column slot="isPublic" label="是否公开" align="center">
           <template slot-scope="{ row }">
             <el-switch
               v-model="row.isPublic"
@@ -71,7 +71,7 @@
             </el-switch>
           </template>
         </el-table-column>
-        <el-table-column slot="options" width="180px" fixed="right" label="操作" align="center">
+        <el-table-column slot="options" width="120px" fixed="right" label="操作" align="center">
           <template slot-scope="{ row }">
             <div class="table-options">
               <el-button type="text" @click="toAdd(row.id)">编辑</el-button>
@@ -117,8 +117,7 @@
           {prop: 'type', label: '类型', align: 'center'},
           {prop: 'phone', label: '电话', align: 'center'},
           {prop: 'createTime', align: 'center', label: '创建时间'},
-          {slot: 'isPublic', label: '是否公开', align: 'center'},
-          {slot: 'options', label: '操作'}
+          {slot: 'isPublic', label: '是否公开', align: 'center'}
         ],
         areaName: '',
         unitName: '',