See999 4 years ago
parent
commit
8aa5778976

+ 20 - 23
src/xt_pages/outpatientCharges/components/prescriptionTable.vue View File

@@ -4,22 +4,24 @@
4 4
               :row-style="{ color: '#303133' }"
5 5
               :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}" highlight-current-row>
6 6
       <el-table-column align="center" prop="name" label="名称">
7
-        <template slot-scope="scope">{{ scope.row.drug_name }}</template>
7
+        <template slot-scope="scope"><span :title='scope.row.drug_name'>{{ scope.row.drug_name }}</span></template>
8 8
       </el-table-column>
9 9
 
10
-      <el-table-column align="center" prop="name" width="50" :label="'单次\n用量'">
10
+      <el-table-column align="center" prop="name" width="90" label="单次用量">
11 11
         <template slot-scope="scope">
12
-          <el-input v-model="scope.row.single_dose" readonly></el-input>
13
-          <div> {{scope.row.min_unit}}</div>
12
+          <div style="display:flex;align-items:center;">
13
+            <el-input v-model="scope.row.single_dose" readonly style="width:65%;"></el-input>
14
+            <div> {{scope.row.min_unit}}</div>
15
+          </div>
14 16
         </template>
15 17
       </el-table-column>
16
-      <el-table-column align="center" prop="name" width="50" label="用法">
18
+      <el-table-column align="center" prop="name" width="100" label="用法">
17 19
         <template slot-scope="scope">
18 20
           <el-input v-model="scope.row.delivery_way" readonly></el-input>
19 21
 
20 22
         </template>
21 23
       </el-table-column>
22
-      <el-table-column align="center" prop="name" width="50" label="频率">
24
+      <el-table-column align="center" prop="name" width="100" label="频率">
23 25
         <template slot-scope="scope">
24 26
           <el-input v-model="scope.row.execution_frequency" readonly></el-input>
25 27
         </template>
@@ -27,20 +29,20 @@
27 29
 
28 30
       <el-table-column align="center" prop="name" width="100" label="总量">
29 31
         <template slot-scope="scope">
30
-          <div style="display:flex;">
31
-            <el-input v-model="scope.row.prescribing_number" style="width:50%" readonly placeholder=""></el-input>
32
+          <div style="display:flex;align-items:center;">
33
+            <el-input v-model="scope.row.prescribing_number" style="width:60%" readonly placeholder=""></el-input>
32 34
             <div>{{scope.row.min_unit}}</div>
33 35
           </div>
34 36
         </template>
35 37
       </el-table-column>
36
-      <el-table-column align="center" prop="name" width="50" label="单价">
38
+      <el-table-column align="center" prop="name" width="60" label="单价">
37 39
         <template slot-scope="scope">
38 40
           <el-input v-model="scope.row.retail_price" placeholder="" readonly></el-input>
39 41
         </template>
40 42
       </el-table-column>
41 43
       <el-table-column align="center" prop="name" width="50" label="备注">
42 44
         <template slot-scope="scope">
43
-          <el-input v-model="scope.row.remark" style="width:50%" placeholder="" readonly></el-input>
45
+          <el-input v-model="scope.row.remark" :title="scope.row.remark" placeholder="" readonly></el-input>
44 46
         </template>
45 47
       </el-table-column>
46 48
     </el-table>
@@ -51,35 +53,35 @@
51 53
       <el-table-column align="center" prop="project_name" label="名称">
52 54
         <template slot-scope="scope">{{ scope.row.project_name }}</template>
53 55
       </el-table-column>
54
-      <el-table-column align="center" prop="statistical_classification" width="50" label="组">
56
+      <el-table-column align="center" prop="statistical_classification" width="100" label="组">
55 57
         <template slot-scope="scope">
56 58
           {{getGroup(scope.row.statistical_classification)}}
57 59
         </template>
58 60
       </el-table-column>
59
-      <el-table-column align="center" prop="single_dose" width="130" :label="'单次\n用量'">
61
+      <el-table-column align="center" prop="single_dose" width="80" label="单次用量">
60 62
         <template slot-scope="scope">
61 63
           <el-input v-model="scope.row.single_dose" placeholder="" readonly></el-input>
62 64
         </template>
63 65
       </el-table-column>
64
-      <el-table-column align="center" prop="delivery_way" width="130" label="用法">
66
+      <el-table-column align="center" prop="delivery_way" width="80" label="用法">
65 67
         <template slot-scope="scope">
66 68
           <el-input v-model="scope.row.delivery_way" placeholder="" readonly></el-input>
67 69
         </template>
68 70
       </el-table-column>
69
-      <el-table-column align="center" prop="execution_frequency" width="130" label="频率">
71
+      <el-table-column align="center" prop="execution_frequency" width="80" label="频率">
70 72
         <template slot-scope="scope">
71 73
           <el-input v-model="scope.row.execution_frequency" placeholder="" readonly></el-input>
72 74
         </template>
73 75
       </el-table-column>
74
-      <el-table-column align="center" prop="number_days" width="130" label="天数">
76
+      <el-table-column align="center" prop="number_days" width="50" label="天数">
75 77
         <template slot-scope="scope">
76 78
           <el-input v-model="scope.row.number_days" placeholder="" readonly></el-input>
77 79
         </template>
78 80
       </el-table-column>
79
-      <el-table-column align="center" prop="total" width="100" label="总量">
81
+      <el-table-column align="center" prop="total" width="50" label="总量">
80 82
         <template slot-scope="scope">
81 83
           <div style="display:flex;">
82
-            <el-input v-model="scope.row.total" style="width:50" placeholder="" readonly></el-input>
84
+            <el-input v-model="scope.row.total" placeholder="" readonly></el-input>
83 85
           </div>
84 86
         </template>
85 87
       </el-table-column>
@@ -88,18 +90,13 @@
88 90
           <el-input v-model="scope.row.price" placeholder="" readonly></el-input>
89 91
         </template>
90 92
       </el-table-column>
91
-      <el-table-column align="center" prop="name" width="120" label="备注">
93
+      <el-table-column align="center" prop="name" width="50" label="备注">
92 94
         <template slot-scope="scope">
93 95
           <el-input v-model="scope.row.remark" readonly></el-input>
94 96
         </template>
95 97
       </el-table-column>
96 98
     </el-table>
97 99
   </div>
98
-
99
-
100
-
101
-
102
-
103 100
 </template>
104 101
 
105 102
 <script>

+ 5 - 4
src/xt_pages/outpatientDoctorStation/components/deskPrescription.vue View File

@@ -135,7 +135,7 @@
135 135
                           @select-all="changeAllGoodInfoTableData"
136 136
                           :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}"
137 137
                           highlight-current-row>
138
-                  <el-table-column type="selection" width="40"></el-table-column>
138
+                  <el-table-column type="selection" width="40" align="center"></el-table-column>
139 139
                   <el-table-column prop="name" label="名称">
140 140
                     <template slot-scope="scope">{{ scope.row.drug_name }}</template>
141 141
                   </el-table-column>
@@ -164,7 +164,7 @@
164 164
                           :row-style="{ color: '#303133' }"
165 165
                           :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}"
166 166
                           highlight-current-row>
167
-                  <el-table-column type="selection" width="40"></el-table-column>
167
+                  <el-table-column type="selection" width="40" align="center"></el-table-column>
168 168
                   <el-table-column prop="name" label="名称">
169 169
                     <template slot-scope="scope">{{}}</template>
170 170
                   </el-table-column>
@@ -190,7 +190,7 @@
190 190
                           @select-all="changeAllGoodInfoTableDataTwo"
191 191
                           :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}"
192 192
                           highlight-current-row>
193
-                  <el-table-column type="selection" width="40"></el-table-column>
193
+                  <el-table-column type="selection" width="40" align="center"></el-table-column>
194 194
                   <el-table-column prop="name" label="名称">
195 195
                     <template slot-scope="scope">{{ scope.row.project_name }}</template>
196 196
                   </el-table-column>
@@ -207,7 +207,7 @@
207 207
                           :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}"
208 208
                           highlight-current-row
209 209
                           @select='selectTeam'>
210
-                  <el-table-column type="selection" width="40"></el-table-column>
210
+                  <el-table-column type="selection" width="40" align="center"></el-table-column>
211 211
                   <el-table-column prop="name" label="名称">
212 212
                     <template slot-scope="scope">{{scope.row.project_team}}</template>
213 213
                   </el-table-column>
@@ -1179,6 +1179,7 @@
1179 1179
     .el-tab-pane{
1180 1180
       display: flex;
1181 1181
       flex-direction: column;
1182
+      height:100%;
1182 1183
     }
1183 1184
   }
1184 1185
   #tab-more {

+ 8 - 10
src/xt_pages/outpatientDoctorStation/components/prescriptionTable.vue View File

@@ -3,7 +3,7 @@
3 3
     <el-table v-if="activeType  == 1" :data="prescription.advices" border style="width: 99%;" :row-style="{ color: '#303133' }"
4 4
               :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}" highlight-current-row>
5 5
       <el-table-column align="center" prop="drug_name" label="名称">
6
-        <template slot-scope="scope">{{ scope.row.drug_name }}</template>
6
+        <template slot-scope="scope"><span :title="scope.row.drug_name">{{ scope.row.drug_name }}</span></template>
7 7
       </el-table-column>
8 8
 
9 9
       <el-table-column align="center" prop="single_dose" width="90" label="单次用量">
@@ -54,7 +54,7 @@
54 54
       </el-table-column>
55 55
       <el-table-column align="center" prop="remark" width="50" label="备注">
56 56
         <template slot-scope="scope">
57
-          <el-input v-model="scope.row.remark" placeholder=""></el-input>
57
+          <el-input v-model="scope.row.remark" :title="scope.row.remark" placeholder=""></el-input>
58 58
         </template>
59 59
       </el-table-column>
60 60
       <el-table-column align="center" width="40" prop="name" label="操作">
@@ -68,24 +68,22 @@
68 68
               :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}" highlight-current-row>
69 69
       <!-- <el-table-column align="center" type="index" width="40" label="序号"></el-table-column> -->
70 70
       <el-table-column align="center" prop="project_name" label="名称">
71
-        <template slot-scope="scope">{{ scope.row.project_name }}</template>
71
+        <template slot-scope="scope"><span :title="scope.row.project_name">{{ scope.row.project_name }}</span></template>
72 72
       </el-table-column>
73 73
       <el-table-column align="center" prop="statistical_classification" width="100" label="组">
74
-        <template slot-scope="scope">
75
-          {{getGroup(scope.row.statistical_classification)}}
76
-        </template>
74
+        <template slot-scope="scope">{{getGroup(scope.row.statistical_classification)}}</template>
77 75
       </el-table-column>
78
-      <el-table-column align="center" prop="single_dose" width="80" :label="'单次\n用量'">
76
+      <el-table-column align="center" prop="single_dose" width="80" label="单次用量">
79 77
         <template slot-scope="scope">
80 78
           <el-input v-model="scope.row.single_dose" placeholder=""></el-input>
81 79
         </template>
82 80
       </el-table-column>
83
-      <el-table-column align="center" prop="delivery_way" width="50" label="用法">
81
+      <el-table-column align="center" prop="delivery_way" width="80" label="用法">
84 82
         <template slot-scope="scope">
85 83
           <el-input v-model="scope.row.delivery_way" placeholder=""></el-input>
86 84
         </template>
87 85
       </el-table-column>
88
-      <el-table-column align="center" prop="execution_frequency" width="50" label="频率">
86
+      <el-table-column align="center" prop="execution_frequency" width="80" label="频率">
89 87
         <template slot-scope="scope">
90 88
           <el-input v-model="scope.row.execution_frequency" placeholder=""></el-input>
91 89
         </template>
@@ -109,7 +107,7 @@
109 107
       </el-table-column>
110 108
       <el-table-column align="center" prop="name" width="50" label="备注">
111 109
         <template slot-scope="scope">
112
-           <el-input v-model="scope.row.remark"></el-input>
110
+           <el-input v-model="scope.row.remark" :title="scope.row.remark"></el-input>
113 111
         </template>
114 112
       </el-table-column>
115 113
       <el-table-column align="center" width="40" prop="name" label="操作">

+ 5 - 7
src/xt_pages/outpatientDoctorStation/doctorDesk.vue View File

@@ -17,7 +17,7 @@
17 17
           </el-radio-group>
18 18
         </div>
19 19
         <div class="mainCell" style="margin-bottom:10px;">
20
-          <el-input size="small" placeholder="请输入姓名或就诊号" @keyup.enter.native='searchAction' v-model="search_input" class="filter-item"/>
20
+          <el-input size="small" placeholder="请输入姓名或就诊号" @input="searchAction" @keyup.enter.native='searchAction' v-model="search_input" class="filter-item"/>
21 21
           <el-button size="small" style="margin-left:10px;" class="filter-item" type="primary" @click="searchAction">
22 22
             搜索
23 23
           </el-button>
@@ -44,13 +44,13 @@
44 44
             <el-radio-button label="电子处方"></el-radio-button>
45 45
             <el-radio-button label="电子病历"></el-radio-button>
46 46
           </el-radio-group>
47
-          <div class="mainCell fixedCell" style="float:right" v-if="titleType == '处方'">
47
+          <div class="mainCell fixedCell" style="float:right" v-if="titleType == '电子处方'">
48 48
             <el-button size="small" ref="button_one"   @click="open(1)" type="primary" style="margin-left:10px;">保存</el-button>
49 49
             <el-button size="small" ref="button_two"   @click="open(2)" type="primary">打印</el-button>
50 50
             <el-button size="small" ref="button_three" @click="open(4)" type="primary">选择模板</el-button>
51 51
             <el-button size="small" ref="button_four"  @click="open(5)" type="primary">存模板</el-button>
52 52
           </div>
53
-          <div class="mainCell fixedCell" style="float:right" v-if="titleType == '病历'">
53
+          <div class="mainCell fixedCell" style="float:right" v-if="titleType == '电子病历'">
54 54
             <el-button size="small" @click="opentwo(1)" type="primary" style="margin-left:10px;">保存</el-button>
55 55
             <el-button size="small" @click="opentwo(2)" type="primary">打印</el-button>
56 56
             <el-button size="small" @click="opentwo(3)" type="primary">病历调用</el-button>
@@ -111,7 +111,7 @@
111 111
           { path: false, name: '门诊医生站' },
112 112
           { path: false, name: '医生工作台' }
113 113
         ],
114
-        titleType: '处方',
114
+        titleType: '电子处方',
115 115
         patientTableData: [{}],
116 116
         patientTableDataTwo:[{}],
117 117
         patientInfo: {},
@@ -144,9 +144,7 @@
144 144
               arr = arr.concat(this.patientTableData[i])
145 145
             }
146 146
           }
147
-          if(arr.length > 0){
148
-            this.patientTableData = arr
149
-          }
147
+          this.patientTableData = arr
150 148
 
151 149
         }
152 150
 

+ 5 - 4
src/xt_pages/outpatientDoctorStation/pastInquiries.vue View File

@@ -13,11 +13,9 @@
13 13
                         :editable="false" :clearable="false" style="width: 196px;margin-right:10px;" type="date"
14 14
                         placeholder="选择日期时间" align="right"></el-date-picker>
15 15
       </div>
16
-      <el-table :data="tableData" border style="width: 100%;" :row-style="{ color: '#303133' }"
16
+      <el-table :data="tableData" border ref="table" style="width: 100%;" :row-style="{ color: '#303133' }"
17 17
                 :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}" highlight-current-row>
18
-        <el-table-column align="center" label="序号" width="60" type="index">
19
-          <!--<template slot-scope="scope">{{ scope.$index +1 }}</template>-->
20
-        </el-table-column>
18
+        <el-table-column align="center" label="序号" width="60" type="index"></el-table-column>
21 19
         <el-table-column align="center" prop="name" label="姓名" width="100">
22 20
           <template slot-scope="scope">{{ scope.row.patient.name }}</template>
23 21
         </el-table-column>
@@ -119,6 +117,9 @@
119 117
             return false
120 118
           } else {
121 119
             this.tableData = response.data.data.order
120
+            this.$nextTick(() => {
121
+              this.$refs.table.doLayout(); //解决表格错位
122
+            });
122 123
 
123 124
           }
124 125
         })