Merge remote-tracking branch 'origin/pet' into dev

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) {

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="选择月"/>

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: [

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: '请输入正确的手机号码或座机号码'
           }
         ]
       },

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(() => {