Merge branch 'feature/zp' into feature/zl

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

@@ -1277,7 +1277,15 @@
             cancelButtonText: '否',
             type: 'warning',
           }).then(() => {
-            reMatchDoctor(this.diagnoseLogId);
+            this.loading = true;
+            reMatchDoctor(this.diagnoseLogId)
+              .then(() => {
+                this.loading = false;
+                this.search(false);
+              })
+              .catch(() => {
+                this.loading = false;
+              });
           });
         } else {
           this.diagnosisTimeVisible = true;