From 6a7319d3331b80da2a174951b12c730de357a315 Mon Sep 17 00:00:00 2001
From: shanao <wangpeng@zcloudchina.com>
Date: Wed, 11 Dec 2024 17:50:34 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90bug=E3=80=91=201.=20=E4=BA=BA=E5=91=98?=
 =?UTF-8?q?=E6=90=9C=E5=AD=90=E7=A1=AE=E5=AE=9A=E5=90=8E=E4=B8=8D=E8=83=BD?=
 =?UTF-8?q?=E9=87=8D=E7=BD=AE=E8=A1=A8=E5=8D=95=202.=20=E6=8E=92=E7=8F=AD?=
 =?UTF-8?q?=E7=99=BB=E8=AE=B0=E7=AE=A1=E7=90=86=E6=97=B6=E9=97=B4=E9=80=89?=
 =?UTF-8?q?=E6=8B=A9=E6=A1=86=E5=A4=84=E7=90=86=20=E4=B8=8D=E8=83=BD?=
 =?UTF-8?q?=E8=BE=93=E5=85=A5=20=E4=B8=8D=E8=83=BD=E5=88=A0=E9=99=A4=20?=
 =?UTF-8?q?=E5=8F=AA=E8=83=BD=E9=80=89=E6=8B=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../duty_management/duty_log/components/selectZhiBanUser.vue  | 1 +
 .../duty_management/shift_registration/components/list.vue    | 1 +
 .../emergency_team/rescue_team/components/addPeople.vue       | 4 ++--
 .../emergency_team/rescue_team/components/list.vue            | 4 ++--
 .../emergency_team/rescue_team/components/peopleList.vue      | 4 ++++
 5 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/views/emergen_cyrescue/emergency_report/duty_management/duty_log/components/selectZhiBanUser.vue b/src/views/emergen_cyrescue/emergency_report/duty_management/duty_log/components/selectZhiBanUser.vue
index 541b479..8f20322 100644
--- a/src/views/emergen_cyrescue/emergency_report/duty_management/duty_log/components/selectZhiBanUser.vue
+++ b/src/views/emergen_cyrescue/emergency_report/duty_management/duty_log/components/selectZhiBanUser.vue
@@ -157,6 +157,7 @@ export default {
         return false
       }
       this.$emit('selectPeople', _selectData[0])
+      Object.assign(this.$data, this.$options.data.call(this))
       this.visible = false
     },
     getList(DEPARTMENT_ID) {
diff --git a/src/views/emergen_cyrescue/emergency_report/duty_management/shift_registration/components/list.vue b/src/views/emergen_cyrescue/emergency_report/duty_management/shift_registration/components/list.vue
index a0ad6b0..8681d68 100644
--- a/src/views/emergen_cyrescue/emergency_report/duty_management/shift_registration/components/list.vue
+++ b/src/views/emergen_cyrescue/emergency_report/duty_management/shift_registration/components/list.vue
@@ -6,6 +6,7 @@
           <el-date-picker
             v-model="monthvalue"
             :clearable="false"
+            :editable="false"
             type="month"
             value-format="yyyy-MM"
             placeholder="选择月"/>
diff --git a/src/views/emergen_cyrescue/emergency_team/rescue_team/components/addPeople.vue b/src/views/emergen_cyrescue/emergency_team/rescue_team/components/addPeople.vue
index b697239..1c31a65 100644
--- a/src/views/emergen_cyrescue/emergency_team/rescue_team/components/addPeople.vue
+++ b/src/views/emergen_cyrescue/emergency_team/rescue_team/components/addPeople.vue
@@ -92,8 +92,8 @@ export default {
         TELEPHONE: [
           { required: true, message: '请输入办公电话', trigger: 'blur' },
           {
-            pattern: /^(13[0-9]|14[01456879]|15[0-35-9]|16[2567]|17[0-8]|18[0-9]|19[0-35-9])\d{8}$/,
-            message: '请输入正确的手机号码'
+            pattern: /^1[3-9]\d{9}$|^0\d{2,3}-\d{7,8}$/,
+            message: '请输入正确的手机号码或座机号码'
           }
         ],
         TEAM_POSITION: [
diff --git a/src/views/emergen_cyrescue/emergency_team/rescue_team/components/list.vue b/src/views/emergen_cyrescue/emergency_team/rescue_team/components/list.vue
index ccc353a..307c0f5 100644
--- a/src/views/emergen_cyrescue/emergency_team/rescue_team/components/list.vue
+++ b/src/views/emergen_cyrescue/emergency_team/rescue_team/components/list.vue
@@ -475,8 +475,8 @@ export default {
         RESPONSIBLE_OFFICE_PHONE: [
           { required: true, message: '负责人办公电话不能为空', trigger: 'blur' },
           {
-            pattern: /^(13[0-9]|14[01456879]|15[0-35-9]|16[2567]|17[0-8]|18[0-9]|19[0-35-9])\d{8}$/,
-            message: '请输入正确的手机号码'
+            pattern: /^1[3-9]\d{9}$|^0\d{2,3}-\d{7,8}$/,
+            message: '请输入正确的手机号码或座机号码'
           }
         ]
       },
diff --git a/src/views/emergen_cyrescue/emergency_team/rescue_team/components/peopleList.vue b/src/views/emergen_cyrescue/emergency_team/rescue_team/components/peopleList.vue
index 8893210..0b9eb99 100644
--- a/src/views/emergen_cyrescue/emergency_team/rescue_team/components/peopleList.vue
+++ b/src/views/emergen_cyrescue/emergency_team/rescue_team/components/peopleList.vue
@@ -283,9 +283,11 @@ export default {
           if (data.result === 'success') {
             this.listLoading = false
             this.getList()
+            this.$message.success('删除成功')
           }
         }).catch((e) => {
           this.listLoading = false
+          this.$message.error('删除失败')
         })
       }).catch(() => {
       })
@@ -317,12 +319,14 @@ export default {
             ids: ids
           }
         ).then(() => {
+          this.$message.success('删除成功')
           this.listLoading = false
           this.varList = []
           this.listQuery.page = 1
           this.$refs.multipleTable.clearSelection()
           this.getList()
         }).catch((e) => {
+          this.$message.error('删除失败')
           this.listLoading = false
         })
       }).catch(() => {