1

src/xt_pages/outpatientCharges/outpatientChargesManagement.vue

@@ -5,32 +5,32 @@
     </div>
     <div class="app-container" style="display:flex;flex: 1;padding: 20px 20px 0px 20px;">
       <div class="mainLeft">
-        <!--<div class="mainCell" style="justify-content: space-between;">-->
-        <!--<p>未就诊：<span>1</span>人</p>-->
-        <!--<p>已就诊：<span>0</span>人</p>-->
-        <!--</div>-->
-        <!--<div class="mainCell">-->
-        <!--<el-radio-group v-model="radio" @change="changeRadio">-->
-        <!--<el-radio :label=1>未就诊</el-radio>-->
-        <!--<el-radio :label=2>已就诊</el-radio>-->
-        <!--<el-radio :label=3>全部</el-radio>-->
-        <!--</el-radio-group>-->
-        <!--</div>-->
+        <div class="mainCell" style="justify-content: space-between;">
+        <p>未就诊：<span>1</span>人</p>
+        <p>已就诊：<span>0</span>人</p>
+        </div>
+        <div class="mainCell">
+        <el-radio-group v-model="radio" @change="changeRadio">
+        <el-radio :label=1>未就诊</el-radio>
+        <el-radio :label=2>已就诊</el-radio>
+        <el-radio :label=3>全部</el-radio>
+        </el-radio-group>
+        </div>
         <div class="mainCell" style="margin-bottom:10px;">
           <el-input size="small" @keyup.enter.native='searchAction' v-model.trim="search_input" class="filter-item"/>
           <el-button size="small" style="margin-left:10px;" class="filter-item" type="primary" @click="searchAction">
             搜索
           </el-button>
         </div>
-        <div style="flex:1;overflow-y:auto;">
-          <el-table :data="patientTableData" border style="width: 100%;" :row-style="{ color: '#303133' }"
+        <div>
+          <el-table :data="patientTableData" :height="tableHeight" border style="width: 100%;" :row-style="{ color: '#303133' }"
                     :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}"
                     highlight-current-row ref="tab"
                     @current-change="handleCurrentChange">
-            <el-table-column align="center" prop="name" label="患者姓名">
+            <el-table-column align="center" prop="name" label="姓名" wdith='89'>
               <template slot-scope="scope">{{scope.row.patients?scope.row.patients.name:''}}</template>
             </el-table-column>
-            <el-table-column align="center" prop="name" label="就诊号" width="90">
+            <el-table-column align="center" prop="name" label="就诊号" width="110">
               <template slot-scope="scope">{{ scope.row.his_patient ?scope.row.his_patient.number:''}}</template>
             </el-table-column>
           </el-table>
@@ -229,6 +229,8 @@
           { path: false, name: '门诊收费' },
           { path: false, name: '门诊收费管理' }
         ],
+        tableHeight:'',
+        fullHeight: document.documentElement.clientHeight,
         activeName: 'first',
         info: {},
         curPrescriptions: {},
@@ -259,6 +261,8 @@
       }
     },
     created() {
+      let tableHeight = document.body.clientHeight - 263
+      this.tableHeight = tableHeight
       var nowDate = new Date()
       var nowYear = nowDate.getFullYear()
       var nowMonth = nowDate.getMonth() + 1
@@ -631,6 +635,29 @@
           }
         })
       }
+    },
+    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>

src/xt_pages/outpatientDoctorStation/components/prescriptionTable.vue

@@ -6,10 +6,10 @@
         <template slot-scope="scope">{{ scope.row.drug_name }}</template>
       </el-table-column>
 
-      <el-table-column align="center" prop="single_dose" width="80" :label="'单次\n用量'">
+      <el-table-column align="center" prop="single_dose" width="90" label="单次用量">
         <template slot-scope="scope">
           <div style="display:flex;align-items:center;">
-            <el-input v-model="scope.row.single_dose" style="width:60%;"></el-input>
+            <el-input v-model="scope.row.single_dose" style="width:65%;"></el-input>
             <div>{{scope.row.min_unit}}</div>
           </div>
         </template>
@@ -311,6 +311,9 @@
 
 <style lang="scss">
   .prescriptionTable {
+    .el-input__inner{
+      padding: 0 5px;
+    }
     .additionalBox{
       margin-top: 20px;
       display: flex;

src/xt_pages/outpatientDoctorStation/doctorDesk.vue

@@ -17,7 +17,7 @@
           </el-radio-group>
         </div>
         <div class="mainCell" style="margin-bottom:10px;">
-          <el-input size="small" @keyup.enter.native='searchAction' v-model="search_input" class="filter-item"/>
+          <el-input size="small" placeholder="请输入姓名或就诊号" @keyup.enter.native='searchAction' v-model="search_input" class="filter-item"/>
           <el-button size="small" style="margin-left:10px;" class="filter-item" type="primary" @click="searchAction">
             搜索
           </el-button>
@@ -29,7 +29,7 @@
                     highlight-current-row
                     ref="tab"
           >
-            <el-table-column prop="name" label="姓名">
+            <el-table-column prop="name" label="姓名" width='89'>
               <template slot-scope="scope">{{scope.row.patients?scope.row.patients.name:''}}</template>
             </el-table-column>
             <el-table-column prop="name" label="就诊号" width="110">
@@ -41,8 +41,8 @@
       <div class="mainRight">
         <div class="mainHeader">
           <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-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" ref="button_one"   @click="open(1)" type="primary" style="margin-left:10px;">保存</el-button>
@@ -105,7 +105,7 @@
         search_input: '',
         cal_one: 0,
         cal_two: 0,
-        radio: 0,
+        radio: 1,
         record_date: '',
         crumbs: [
           { path: false, name: '门诊医生站' },