Merge remote-tracking branch 'origin/master'

src/views/service-management/medical-record-management/medical-record-management.vue

@@ -6,6 +6,7 @@
           v-model.trim="queryParams.petNickname"
           placeholder="请输入宠物昵称/宠主姓名"
           clearable
+          @keyup.enter.native="handleQuery"
         />
       </el-form-item>
       <el-form-item v-if="!isPlatRole" prop="checkType">
@@ -810,7 +811,7 @@ export default {
     resetQuery() {
       this.resetForm('queryForm')
       this.sortColumn = ''
-      this.queryParams.orderByColumn = ''
+      this.queryParams.orderByColumn = null
       this.queryParams.isAsc = null
       this.queryParams.checkSchedule = null
       this.queryParams.checkType = null

src/views/service-management/treatment-management/treatment-management.vue

@@ -6,6 +6,7 @@
           v-model.trim="queryParams.searchText"
           placeholder="请输入宠物昵称/宠主姓名"
           clearable
+          @keyup.enter.native="handleQuery"
         />
       </el-form-item>
       <el-form-item prop="petWeight">