合并冲突

src/views/IM/diagnosis-admin/diagnosis-list-new.vue

@@ -286,6 +286,7 @@
       ></coordinating-doctor>
       <diagnosis-doctor
         @search="search"
+        v-if="diagnoseFlag"
         :diagnosisDoctorVisible.sync="diagnosisDoctorVisible"
         :diagnoseLogId="diagnoseLogId"
         :diagnoseType="diagnoseType"
@@ -412,6 +413,7 @@ export default {
       diagnosisVisible: false,
       coordinatingVisible: false,
       diagnosisDoctorVisible: false,
+      diagnoseFlag:false,
       appointmentTimeVisible: false,
       diagnosisTimeVisible: false,
       rematchingVisible: false,
@@ -892,6 +894,7 @@ export default {
     },
     //设为待确认时间
     waitMatchTime(row) {
+      this.diagnoseFlag =true
       this.diagnosisDoctorVisible = true;
       this.diagnoseLogId = row.diagnoseLogId;
       this.diagnoseType = row.diagnoseType;