1
0

2 Commitit e911aa2140 ... dd811be11e

Tekijä SHA1 Viesti Päivämäärä
  lmx dd811be11e Merge remote-tracking branch 'origin/dev1.0' into dev1.0 8 kuukautta sitten
  lmx f4ad4f7b8c 修改表单重置功能 8 kuukautta sitten

+ 5 - 1
admin-ui/src/views/work/check/index.vue

@@ -14,6 +14,7 @@
         ">
         <el-input
           placeholder="输入部门关键字"
+          :clearable="true"
           v-model="filterText">
         </el-input>
         <div>
@@ -227,7 +228,10 @@ export default {
     },
     /** 重置按钮操作 */
     resetQuery() {
-      this.resetForm('queryForm')
+      this.dischargeTime = [];
+      this.queryParams.startTime='';
+      this.queryParams.endTime='';
+      this.resetForm('queryForm');
       this.handleQuery()
     },
   },

+ 5 - 4
admin-ui/src/views/work/visit/index.vue

@@ -4,6 +4,7 @@
       <el-col :span="4" style="box-shadow: 0 3px 10px 0 rgb(0 0 0 / 6%); border-right: 1px solid #f1f2f4; overflow-y: auto; height: 100%">
           <el-input
             placeholder="输入部门关键字"
+            :clearable="true"
             v-model="filterText">
           </el-input>
         <div style="height: calc(-203px + 100vh);overflow-y: auto; margin-top: 3px">
@@ -74,6 +75,7 @@ export default {
       total:0,
       // 选中数组
       ids: [],
+      SearchShow:false,
       // 非单个禁用
       single: true,
       // 非多个禁用
@@ -102,9 +104,6 @@ export default {
       if (newVal && newVal.length === 2) {
         this.queryParams.startTime = newVal[0]; // 开始日期
         this.queryParams.endTime = newVal[1]; // 结束日期
-      }else {
-        this.queryParams.startTime = '';
-        this.queryParams.endTime = '';
       }
     },
     filterText(val) {
@@ -161,7 +160,7 @@ export default {
     },
     op(tag, row) {
       if (tag === 'search') {
-        this.iframe({ obj: search, param: {id:row.patId, cardId:row.cardId, name:row.name, department:row.department}, title:'查看患者信息',width: '90%', height: '90%'});
+        this.iframe({ obj: search, param: {id:row.patId, cardId:row.cardId, name:row.name, department:row.department}, title:'查看患者信息',width: '90%', height: '93%'});
       }
     },
     handleQuery() {
@@ -171,6 +170,8 @@ export default {
     /** 重置按钮操作 */
     resetQuery() {
       this.dischargeTime = [];
+      this.queryParams.startTime='';
+      this.queryParams.endTime='';
       this.resetForm('queryForm');
       this.handleQuery();
     },

+ 6 - 2
admin-ui/src/views/work/visit/search.vue

@@ -34,7 +34,8 @@
         <div class="right-body">
           <div class="patient-info-nk" v-if="active === 1">
             <div class="patient-info">
-              <el-descriptions  style="width: 69vw; margin-top: 10px" title="患者信息" :column="3" border>
+              <span style="font-size: 20px;font-weight: 800">患者基本信息</span>
+              <el-descriptions  style="width: 69vw;" :column="3" border>
                 <el-descriptions-item label="患者标识符" v-if="patientInfo">{{patientInfo.patientCode}}</el-descriptions-item>
                 <el-descriptions-item label="就诊卡号" v-if="patientInfo">{{patientInfo.cardNumber}}</el-descriptions-item>
                 <el-descriptions-item label="姓名" v-if="patientInfo">{{patientInfo.name}}</el-descriptions-item>
@@ -58,6 +59,7 @@
             </div>
 
             <div class="patient-nk" style="margin-top: 10px">
+              <span style="font-size: 20px;font-weight: 800">亲属关系</span>
               <el-table style="width:69vw;" height="calc(75vh - 270px)"  :data="nkList" highlight-current-row>
                 <el-table-column label="姓名" align="center" prop="name"></el-table-column>
                 <el-table-column label="所属关系" align="center" prop="kinship"></el-table-column>
@@ -72,7 +74,8 @@
 
           <div class="dg-info" v-if="active === 2">
             <div class="pv">
-              <el-descriptions :column="3" border style="width: 69vw; margin-top: 10px"  title="就诊信息">
+              <span style="font-size: 20px;font-weight: 800">就诊信息</span>
+              <el-descriptions :column="3" border style="width: 69vw;" >
                 <el-descriptions-item label="患者类别">
                   <dict-tag :options="dict.type.patient_category" :value="pvList.patientCategory"></dict-tag>
                 </el-descriptions-item>
@@ -97,6 +100,7 @@
             </div>
 
             <div class="dg" style="margin-top: 10px">
+              <span style="font-size: 20px;font-weight: 800">就诊结果</span>
               <el-table style=" width:69vw;" height="calc(75vh - 270px)" :data="dgList" highlight-current-row>
                 <el-table-column label="诊断名称" align="center" prop="diagnosticName"></el-table-column>
                 <el-table-column label="诊断代码" align="center" prop="diagnosticCode"></el-table-column>