2 Commits e37e9962f7 ... 9d3f125797

Author SHA1 Message Date
  lmx 9d3f125797 Merge remote-tracking branch 'origin/dev1.0' into dev1.0 7 months ago
  lmx 078af6db8e 完善患者信息和检查项目的搜索功能,以及数据显示 7 months ago
2 changed files with 21 additions and 5 deletions
  1. 12 4
      admin-ui/src/views/work/check/index.vue
  2. 9 1
      admin-ui/src/views/work/visit/index.vue

+ 12 - 4
admin-ui/src/views/work/check/index.vue

@@ -20,6 +20,7 @@
         <div>
           <div style="height: calc(-203px + 100vh);overflow-y: auto; margin-top: 3px">
             <el-tree
+              :highlight-current="true"
               class="filter-tree"
               :data="deptOptions"
               default-expand-all
@@ -42,9 +43,9 @@
               @keyup.enter.native="handleQuery"
               class="se" />
           </el-form-item>
-          <el-form-item prop="patientName">
+          <el-form-item prop="name">
             <el-input
-              v-model="queryParams.patientName"
+              v-model="queryParams.name"
               placeholder="请输入患者姓名"
               clearable
               @keyup.enter.native="handleQuery"
@@ -144,7 +145,7 @@ export default {
         pageNum: 1,
         pageSize: 10,
         physician: undefined,
-        patientName: undefined,
+        name: undefined,
         department: undefined,
         deptId: undefined,
         startTime:undefined,
@@ -158,6 +159,11 @@ export default {
         this.queryParams.startTime = newVal[0].toString(); // 开始日期
         this.queryParams.endTime = newVal[1].toString(); // 结束日期
       }
+      if(!newVal){
+        this.queryParams.startTime = ''; // 开始日期
+        this.queryParams.endTime = ''; // 结束日期
+        this.handleQuery();
+      }
     },
     filterText(val) {
       this.$refs.tree.filter(val);
@@ -197,7 +203,9 @@ export default {
         url: '/system/user/deptTree',
       }).then((response) => {
         this.deptOptions = response.data
-        this.queryParams.deptId = response.data[0].id;
+        if(response.data.id != null){
+          this.queryParams.deptId = response.data[0].id;
+        }
         this.getList();
       })
     },

+ 9 - 1
admin-ui/src/views/work/visit/index.vue

@@ -107,6 +107,11 @@ export default {
         this.queryParams.startTime = newVal[0]; // 开始日期
         this.queryParams.endTime = newVal[1]; // 结束日期
       }
+      if(!newVal){
+        this.queryParams.startTime = ''; // 开始日期
+        this.queryParams.endTime = ''; // 结束日期
+        this.handleQuery();
+      }
     },
     filterText(val) {
       this.$refs.tree.filter(val);
@@ -146,7 +151,9 @@ export default {
         url:'/system/user/deptTree'
       }).then((response) => {
         this.deptOptions = response.data;
-        this.queryParams.deptId = response.data[0].id;
+        if(response.data.id != null){
+          this.queryParams.deptId = response.data[0].id;
+        }
         this.getList();
       });
     },
@@ -166,6 +173,7 @@ export default {
       }
     },
     handleQuery() {
+      console.log(this.dischargeTime);
       this.queryParams.pageNum = 1;
       this.getList();
     },