1

src/xt_pages/outpatientDoctorStation/components/deskPrescription.vue

@@ -1,13 +1,13 @@
 <template>
-  <div style="height: calc(100% - 36px);display: flex;flex-direction: column;">
-    <div style="border-top:1px solid #e5e5e5;margin-top:5px;">
+  <div style="height: calc(100% - 36px);display: flex;flex-direction: column;margin-top: 36px;">
+    <!-- <div style="border-top:1px solid #e5e5e5;margin-top:5px;">
       <div class="mainCell" style="margin-bottom:10px;float:right">
         <el-button size="small" @click="open(1)" type="primary" style="margin-left:10px;">保存</el-button>
         <el-button size="small" @click="open(2)" type="primary">打印</el-button>
         <el-button size="small" @click="open(4)" type="primary">选择模板</el-button>
         <el-button size="small" @click="open(5)" type="primary">存模板</el-button>
       </div>
-    </div>
+    </div> -->
     <div class="backColor"></div>
     <div class="mainCenter">
       <div class="centerLeft">
@@ -100,20 +100,24 @@
           <p :class="rightTab == 2 ? 'activeP' : ''" @click="clickTab(2)">项目</p>
         </div>
         <template>
-          <!--<div style="margin-top:5px;">-->
-          <!--<el-input style="width:50%;" v-model="input" placeholder=""></el-input>-->
-          <!--<el-select style="float: right;width: 49%;" v-model="value" placeholder="">-->
-          <!--<el-option-->
-          <!--v-for="item in options"-->
-          <!--:key="item.value"-->
-          <!--:label="item.label"-->
-          <!--:value="item.value">-->
-          <!--</el-option>-->
-          <!--</el-select>-->
-          <!--</div>-->
           <div style="height:84%;overflow-y: auto;margin-bottom: 60px;" v-show="showOne">
             <el-tabs class="rightTabs" v-model="activeName">
               <el-tab-pane label="药品列表" name="1">
+                <div style="margin-bottom:5px;">
+                  <el-input style="width:50%;" v-model="input" placeholder=""></el-input>
+                  <el-select style="margin-right:5px;width:100px;" v-model="value" placeholder="" @change="changeKind">
+                    <el-option
+                      label="全部"
+                      value="0">
+                    </el-option>
+                    <el-option
+                      v-for="(item,index) in getDictionaryDataConfig('system','drug_type')"
+                      :key="index"
+                      :label="item.name"
+                      :value="item.id">
+                    </el-option>
+                  </el-select>
+                </div>
                 <el-table ref="multipleTable" :data="drugs" border @select='selectDrugs' style="width: 100%;"
                           :row-style="{ color: '#303133' }"
                           @select-all="changeAllGoodInfoTableData"
@@ -133,6 +137,17 @@
 
               </el-tab-pane>
               <el-tab-pane label="医嘱模板" name="2">
+                <div style="margin-bottom:5px;">
+                  <el-input style="width:50%;" v-model="input" placeholder=""></el-input>
+                  <el-select style="float: right;width: 49%;" v-model="value" placeholder="">
+                      <el-option
+                      v-for="item in options"
+                      :key="item.value"
+                      :label="item.label"
+                      :value="item.value">
+                      </el-option>
+                  </el-select>
+                </div>
                 <el-table ref="multipleTableTwo" :data="advices_template" border style="width: 100%;"
                           :row-style="{ color: '#303133' }"
                           :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}"
@@ -190,7 +205,7 @@
           </div>
 
           <div class="comfirmBox">
-            <div>
+            <!-- <div>
               <span>药品类型：</span>
               <el-select style="margin-right:5px;width:100px;" v-model="value" placeholder="" @change="changeKind">
                 <el-option
@@ -204,7 +219,7 @@
                   :value="item.id">
                 </el-option>
               </el-select>
-            </div>
+            </div> -->
             <el-button type="primary" size="small" @click="comfirm">确定添加</el-button>
           </div>
         </template>

src/xt_pages/outpatientDoctorStation/components/deskRecord.vue

@@ -1,13 +1,13 @@
 <template>
-  <div class="deskRecord">
-    <div style="overflow:hidden;border-top:1px solid #e5e5e5;margin-top:5px;">
+  <div class="deskRecord" style="margin-top:36px;">
+    <!-- <div style="overflow:hidden;border-top:1px solid #e5e5e5;margin-top:5px;">
       <div class="mainCell" style="margin-bottom:10px;float:right">
         <el-button size="small" @click="open(1)" type="primary" style="margin-left:10px;">保存</el-button>
         <el-button size="small" @click="open(2)" type="primary">打印</el-button>
         <el-button size="small" @click="open(3)" type="primary">病历调用</el-button>
         <el-button size="small" @click="open(4)" type="primary">存模板</el-button>
       </div>
-    </div>
+    </div> -->
     <div class="backColor"></div>
     <div class="mainTitle">基本信息：</div>
     <el-form class="basicForm" :model="patientInfo" :rules="rules" ref="form" label-width="120px">

src/xt_pages/outpatientDoctorStation/doctorDesk.vue

@@ -22,8 +22,8 @@
             搜索
           </el-button>
         </div>
-        <div style="flex:1;overflow-y:auto;">
-          <el-table :data="patientTableData" @row-click='choosePatient' border style="width: 100%;"
+        <div>
+          <el-table :data="patientTableData" :height="tableHeight" @row-click='choosePatient' border style="width: 100%;"
                     :row-style="{ color: '#303133' }"
                     :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}"
                     highlight-current-row
@@ -40,10 +40,22 @@
       </div>
       <div class="mainRight">
         <div class="mainHeader">
-          <el-radio-group v-model="titleType" @change="changeTab">
+          <el-radio-group class="titleBox" v-model="titleType" @change="changeTab">
             <el-radio-button label="处方"></el-radio-button>
             <el-radio-button label="病历"></el-radio-button>
           </el-radio-group>
+          <div class="mainCell fixedCell" style="float:right" v-if="titleType == '处方'">
+            <el-button size="small" @click="open(1)" type="primary" style="margin-left:10px;">保存</el-button>
+            <el-button size="small" @click="open(2)" type="primary">打印</el-button>
+            <el-button size="small" @click="open(4)" type="primary">选择模板</el-button>
+            <el-button size="small" @click="open(5)" type="primary">存模板</el-button>
+          </div>
+          <div class="mainCell fixedCell" style="float:right" v-if="titleType == '病历'">
+            <el-button size="small" @click="open(1)" type="primary" style="margin-left:10px;">保存</el-button>
+            <el-button size="small" @click="open(2)" type="primary">打印</el-button>
+            <el-button size="small" @click="open(3)" type="primary">病历调用</el-button>
+            <el-button size="small" @click="open(4)" type="primary">存模板</el-button>
+          </div>
         </div>
         <!--<desk-prescription ref="prescriptions"   :prescriptions="prescriptions" :patientInfo="patientInfo" :hisPatientInfo="hisPatientInfo"-->
         <!--v-if="titleType == '处方'" style="flex:1;"></desk-prescription>-->
@@ -76,6 +88,8 @@
     },
     data() {
       return {
+        tableHeight:'',
+        fullHeight: document.documentElement.clientHeight,
         prescriptions: [
           {
             name: '处方1',
@@ -307,8 +321,33 @@
       this.diagnoses = this.getDictionaryDataConfig('system', 'diagnose')
       this.other_sick = this.getDictionaryDataConfig('system', 'other_sick_history')
 
+      console.log('1222232434234',document.documentElement.clientHeight)
+      let tableHeight = document.body.clientHeight - 263
+      this.tableHeight = tableHeight
 
-
+    },
+    mounted(){
+      const that = this
+      window.onresize = () => {
+        return (() => {
+          window.fullHeight = document.documentElement.clientHeight
+          that.fullHeight = window.fullHeight
+        })()
+      }
+    },
+    watch: {
+      fullHeight (val) {
+        if(!this.timer) {
+          this.fullHeight = val
+          let tableHeight = val - 263
+          this.tableHeight = tableHeight
+          this.timer = true
+          let that = this
+          setTimeout(function (){
+            that.timer = false
+          },400)
+        }
+      }
     }
   }
 </script>
@@ -460,6 +499,24 @@
     align-items: center;
     justify-content: space-between;
   }
+  .mainHeader{
+    width:100%;
+    background: #fff;
+    position: fixed;
+    z-index: 100;
+    height: 36px;
+  }
+  .titleBox{
+    position: fixed;
+    z-index: 99;
+    background: #fff;
+  }
+  .fixedCell{
+    position: fixed;
+    z-index: 99;
+    right: 30px;
+    background: #fff;
+  }
 </style>
 
 <style lang="scss">