Merge branch 'dev-20210702' of...

Merge branch 'dev-20210702' of http://192.168.110.53/com.pica.cloud.education.frontend/pica-admin-consultation into dev-20210702

src/components/common/appointment-time.vue

@@ -2,7 +2,7 @@
   <div>
     <el-dialog
       :title="title"
-      :visible.sync="appointmentTimeVisible">
+      :visible.sync="appointmentTimeVisible" @close="cancel">
       <!--            <el-row :gutter="30" class="row search" type="flex" style="margin-bottom:0;">-->
       <el-form ref="setForm"
                :rules="addRules"
@@ -28,6 +28,7 @@
             v-model="rangeTime"
             type="datetimerange"
             value-format="yyyy-MM-dd HH:mm:ss"
+            format="yyyy-MM-dd HH:mm:ss"
             range-separator="至"
             start-placeholder="开始日期"
             end-placeholder="结束日期"

src/components/common/coordinating-doctor.vue

@@ -2,7 +2,7 @@
   <div>
     <el-dialog
       :title="title"
-      :visible.sync="coordinatingVisible">
+      :visible.sync="coordinatingVisible" @close="cancel">
       <!--            <el-row :gutter="30" class="row search" type="flex" style="margin-bottom:0;">-->
       <el-form ref="setForm"
                :rules="addRules"

src/components/common/diagnosis-doctor.vue

@@ -2,7 +2,7 @@
   <div>
     <el-dialog
       :title="title"
-      :visible.sync="diagnosisDoctorVisible">
+      :visible.sync="diagnosisDoctorVisible" @close="cancel">
       <!--            <el-row :gutter="30" class="row search" type="flex" style="margin-bottom:0;">-->
       <el-form ref="setForm"
                :rules="addRules"

src/components/common/diagnosis-time.vue

@@ -2,7 +2,7 @@
   <div>
     <el-dialog
       :title="title"
-      :visible.sync="diagnosisTimeVisible">
+      :visible.sync="diagnosisTimeVisible" @close="cancel">
       <!--            <el-row :gutter="30" class="row search" type="flex" style="margin-bottom:0;">-->
       <el-form ref="setForm"
                :rules="addRules"

src/components/common/diagnosis.vue

@@ -2,7 +2,7 @@
   <div>
     <el-dialog
       :title="title"
-      :visible.sync="diagnosisVisible">
+      :visible.sync="diagnosisVisible" @close="cancel">
       <!--            <el-row :gutter="30" class="row search" type="flex" style="margin-bottom:0;">-->
       <el-form ref="setForm"
                :rules="addRules"

src/components/common/followup.vue

@@ -2,7 +2,7 @@
   <div>
     <el-dialog
       :title="title"
-      :visible.sync="followupVisible">
+      :visible.sync="followupVisible" @close="cancel">
       <!--            <el-row :gutter="30" class="row search" type="flex" style="margin-bottom:0;">-->
       <el-form ref="setForm"
                :rules="addRules"

src/components/common/match.vue

@@ -2,7 +2,7 @@
   <div>
     <el-dialog
       :title="title"
-      :visible.sync="matchVisible">
+      :visible.sync="matchVisible" @close="cancel">
       <!--            <el-row :gutter="30" class="row search" type="flex" style="margin-bottom:0;">-->
       <el-form ref="setForm"
                :rules="addRules"

src/components/common/matching-doctor.vue

@@ -2,7 +2,7 @@
   <div>
     <el-dialog
       :title="title"
-      :visible.sync="doctorVisible">
+      :visible.sync="doctorVisible" @close="cancel">
       <!--            <el-row :gutter="30" class="row search" type="flex" style="margin-bottom:0;">-->
       <el-form ref="setForm"
                :rules="addRules"
@@ -146,6 +146,7 @@ export default {
 
     cancel() {
       this.$emit('update:doctorVisible', false);
+      // this.doctorVisible = false;
     },
     change(data){
       for (let i=0;i < this.depList.length; i++){

src/components/common/refund.vue

@@ -2,7 +2,7 @@
   <div>
     <el-dialog
       :title="title"
-      :visible.sync="refundVisible">
+      :visible.sync="refundVisible" @close="cancel">
       <!--            <el-row :gutter="30" class="row search" type="flex" style="margin-bottom:0;">-->
       <el-form ref="setForm"
                :rules="addRules"

src/components/common/rematching-doctor.vue

@@ -2,7 +2,7 @@
   <div>
     <el-dialog
       :title="title"
-      :visible.sync="rematchingVisible">
+      :visible.sync="rematchingVisible" @close="cancel">
       <!--            <el-row :gutter="30" class="row search" type="flex" style="margin-bottom:0;">-->
       <el-form ref="setForm"
                :rules="addRules"