Merge branch '20201109_pc_vue_new_branch' of http://git.shengws.com/csx/Vue_New into 20201109_pc_vue_new_branch

src/xt_pages/outpatientRegistration/index.vue

                     that.getPatientList()
                     that.$message({ message: '挂号成功', type: 'success' })
                     that.loadingone = false
-                    var his_info = response.data.data.his_info
-                    that.hisPatientInfo = his_info
+
+                    // var his_info = response.data.data.his_info
+                    // that.hisPatientInfo = his_info
                   }
                 })
                 .catch(function(error) {

src/xt_pages/outpatientRegistration/registrationHistory.vue

                   that.$message.error(response.data.data.msg)
 
                 } else {
-                  this.getlist()
+                  that.getlist()
                   that.$message({ message: '退号成功', type: 'success' })
                 }
               }