Procházet zdrojové kódy

9月23,页面美化

yq1 před 6 měsíci
rodič
revize
43c6eb764c

+ 3 - 5
src/xt_pages/dialysis/bloodPresssWatch.vue Zobrazit soubor

@@ -553,6 +553,8 @@
553 553
         <el-button type="primary" @click="changeSearchMode">{{
554 554
           search_mode == 1 ? "改为病人查询" : "改为日期查询"
555 555
         }}</el-button>
556
+        <el-button type="primary" @click="printOrder">透析并发症登记打印</el-button>
557
+        <el-button type="primary" @click="toExport">导出</el-button>
556 558
       </div>
557 559
       <div class="cell clearfix"  v-show="search_mode == 2">
558 560
          <label class="title">
@@ -615,11 +617,6 @@
615 617
         </div>
616 618
       </div>
617 619
 
618
-      <div style="margin-left: 1100px; margin-bottom: 10px;">
619
-        <el-button type="primary" size="small" @click="printOrder">透析并发症登记打印</el-button>
620
-        <el-button type="primary" size="small" @click="toExport">导出</el-button>
621
-      </div>
622
-
623 620
       <el-table
624 621
         :row-style="{ color: '#303133' }"
625 622
         :header-cell-style="{
@@ -634,6 +631,7 @@
634 631
         @selection-change="handleSelectionChange"
635 632
         highlight-current-row
636 633
         :cell-class-name="cellStyle"
634
+        height="calc(100vh - 300px)"
637 635
       >
638 636
         <el-table-column
639 637
           type="selection"

+ 67 - 88
src/xt_pages/dialysis/newDoctorAdvice.vue Zobrazit soubor

@@ -24,30 +24,44 @@
24 24
     </div>
25 25
     <div class="app-container">
26 26
       <div class="filter-container">
27
-      <el-autocomplete
28
-          class="checkSearch"
29
-          popper-class="my-autocomplete"
30
-          v-model.trim="listQuery.keyword"
31
-          :fetch-suggestions="querySearchAsync"
32
-          :trigger-on-focus="false"
33
-          placeholder="患者姓名"
34
-          @select="handleSelect"
35
-        >
36
-          <i class="el-icon-search el-input__icon" slot="suffix"></i>
37
-          <template slot-scope="{ item }">
38
-            <div class="name">{{ item.name }}</div>
39
-          </template>
40
-       </el-autocomplete>
41
-       <el-button type="primary" @click="toSeach">搜索</el-button>
42
-
43
-
44
-      </div>
45
-      <div class="filter-container">
46
-      <el-input style="width:200px" placeholder="请输入药品名称" v-model="keyword"></el-input>
47
-       <el-button type="primary" @click="toSeachOne">搜索</el-button>
48
-
49
-
27
+        <div style="display: flex;">
28
+          <div style="flex: 1;">
29
+            <el-autocomplete
30
+            class="checkSearch"
31
+            popper-class="my-autocomplete"
32
+            v-model.trim="listQuery.keyword"
33
+            :fetch-suggestions="querySearchAsync"
34
+            :trigger-on-focus="false"
35
+            placeholder="患者姓名"
36
+            @select="handleSelect"
37
+          >
38
+            <i class="el-icon-search el-input__icon" slot="suffix"></i>
39
+            <template slot-scope="{ item }">
40
+              <div class="name">{{ item.name }}</div>
41
+            </template>
42
+            </el-autocomplete>
43
+            <el-button type="primary" @click="toSeach">搜索</el-button>
44
+            
45
+            <el-input style="width:200px" placeholder="请输入药品名称" v-model="keyword"></el-input>
46
+            <el-button type="primary" @click="toSeachOne">搜索</el-button>
47
+          </div>
48
+          <div style="flex: 1;text-align: right;">
49
+            <el-button type="primary" size="small" @click="toStatic" v-if="org_id!=9671  && org_id!=10340">药品统计</el-button>
50
+
51
+            <el-button type="primary" size="small" @click="toStaticOne" v-if="org_id == 9671 || org_id==10340">药品统计</el-button>
52
+            <el-button type="primary" size="small" @click="toStaticThree">药品月统计</el-button>
53
+
54
+            <el-button type="primary" size="small" @click="toStaticTwo">耗材统计</el-button>
55
+
56
+            <el-button type="primary" size="small" @click="toStaticFour">耗材月统计</el-button>
57
+          </div>
58
+        </div>
59
+        
50 60
       </div>
61
+      <!-- <div class="filter-container">
62
+        <el-input style="width:200px" placeholder="请输入药品名称" v-model="keyword"></el-input>
63
+        <el-button type="primary" @click="toSeachOne">搜索</el-button>
64
+      </div> -->
51 65
       <div class="cell clearfix">
52 66
         <label class="title">
53 67
           <span class="name">日期查询:</span>
@@ -57,16 +71,14 @@
57 71
           prefix-icon="el-icon-date"
58 72
           @change="changeTime"
59 73
           :editable="false"
60
-          style="width: 250px;"
74
+          style="width: 180px;margin-right: 10px;"
61 75
           type="date"
62 76
           placeholder="选择日期时间"
63 77
           align="right"
64 78
           format="yyyy-MM-dd"
65 79
           value-format="timestamp"
66 80
         ></el-date-picker>
67
-      </div>
68 81
 
69
-      <div class="cell clearfix">
70 82
         <label class="title">
71 83
           <span class="name">排序:</span>
72 84
         </label>
@@ -81,6 +93,21 @@
81 93
         </el-select>
82 94
       </div>
83 95
 
96
+      <!-- <div class="cell clearfix">
97
+        <label class="title">
98
+          <span class="name">排序:</span>
99
+        </label>
100
+        <el-select v-model="sort" placeholder="请选择" @change="selectSortType">
101
+          <el-option
102
+            v-for="item in options"
103
+            :key="item.name"
104
+            :label="item.name"
105
+            :value="item.id"
106
+            >
107
+          </el-option>
108
+        </el-select>
109
+      </div> -->
110
+
84 111
 
85 112
       <div class="cell clearfix">
86 113
         <label class="title"> <span class="name">排班班次</span> : </label>
@@ -98,7 +125,7 @@
98 125
         </div>
99 126
       </div>
100 127
      <div class="cell clearfix">
101
-        <label class="title"> <span class="name">收费状态</span> : </label>
128
+        <label class="title"><span class="name">收费状态</span> : </label>
102 129
         <div class="time">
103 130
           <ul class>
104 131
             <li
@@ -114,7 +141,7 @@
114 141
       </div>
115 142
 
116 143
       <div class="cell clearfix">
117
-        <label class="title"> <span class="name">分区</span> : </label>
144
+        <label class="title"><span class="name">分区</span> : </label>
118 145
         <div class="time">
119 146
           <ul class>
120 147
             <li
@@ -146,7 +173,7 @@
146 173
       </div>
147 174
 
148 175
       <div class="cell clearfix">
149
-        <label class="title"> <span class="name">执行频率</span> : </label>
176
+        <label class="title"> <span class="name">执行频率 : </span></label>
150 177
         <div class="time">
151 178
           <ul class>
152 179
             <li
@@ -182,7 +209,7 @@
182 209
         <el-button type="primary" size="small" @click="toSettle">收费</el-button>
183 210
       </div> -->
184 211
 
185
-      <div style="margin-top: 10px;margin-bottom:10px">
212
+      <!-- <div style="margin-top: 10px;margin-bottom:10px">
186 213
         <el-button type="primary" size="small" @click="toStatic" v-if="org_id!=9671  && org_id!=10340">药品统计</el-button>
187 214
 
188 215
         <el-button type="primary" size="small" @click="toStaticOne" v-if="org_id == 9671 || org_id==10340">药品统计</el-button>
@@ -195,7 +222,7 @@
195 222
         <el-button type="primary" size="small" @click="toStaticFour">耗材月统计</el-button>
196 223
 
197 224
 
198
-      </div>
225
+      </div> -->
199 226
 
200 227
 
201 228
       <el-table :data="scheduleMap" border :row-style="{ color: '#303133' }" :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}"
@@ -269,13 +296,7 @@
269 296
             </el-dropdown>
270 297
           </template>
271 298
         </el-table-column>
272
-        <el-table-column
273
-          prop="start_time"
274
-          align="center"
275
-          min-width="30px"
276
-          label="执行时间"
277
-          sortable
278
-        >
299
+        <el-table-column prop="start_time" min-width="30px" label="执行时间" align="center" sortable>
279 300
           <template slot-scope="scope">
280 301
             <span v-if="scope.row.execution_time != 0">
281 302
               {{scope.row.execution_time | parseTime('{m}-{d} {h}:{i}')}}
@@ -299,13 +320,7 @@
299 320
             <span v-else>{{getXuserName(scope.row.checker)}}</span>
300 321
           </template>
301 322
         </el-table-column>
302
-        <el-table-column
303
-          prop="check_time"
304
-          align="center"
305
-          min-width="30px"
306
-          label="校对时间"
307
-          sortable
308
-        >
323
+        <el-table-column prop="check_time" align="center" label="校对时间" min-width="30px" sortable>
309 324
           <template slot-scope="scope">
310 325
             <span v-if="scope.row.check_time != 0  && org_id!=10460">
311 326
               {{scope.row.check_time | parseTime('{m}-{d} {h}:{i}')}}
@@ -321,13 +336,7 @@
321 336
             <span>{{ getXuserName(scope.row.advice_doctor) }}</span>
322 337
           </template>
323 338
         </el-table-column>
324
-        <el-table-column
325
-          prop="created_time"
326
-          align="center"
327
-          min-width="30px"
328
-          label="校对时间"
329
-          sortable
330
-        >
339
+        <el-table-column prop="created_time" align="center" min-width="30px" label="校对时间" sortable>
331 340
           <template slot-scope="scope">
332 341
             <span v-if="scope.row.created_time != 0 && org_id!=10460">
333 342
               {{scope.row.created_time | parseTime('{m}-{d} {h}:{i}')}}
@@ -335,13 +344,7 @@
335 344
             <span v-else></span>
336 345
           </template>
337 346
         </el-table-column>
338
-        <el-table-column
339
-          prop="created_time"
340
-          align="center"
341
-          min-width="30px"
342
-          label="收费状态"
343
-          sortable
344
-        >
347
+        <el-table-column prop="created_time"  align="center" min-width="30px" label="收费状态" sortable>
345 348
           <template slot-scope="scope">
346 349
             <span v-if="scope.row.is_settle == 1">
347 350
               已收费
@@ -363,7 +366,7 @@
363 366
         highlight-current-row
364 367
         :modal-append-to-body="false"
365 368
         v-show="showOne">
366
-        <el-table-column type="selection" width="55" align="center"></el-table-column>
369
+        <el-table-column type="selection" width="50" align="center"></el-table-column>
367 370
         <el-table-column prop="date" label="姓名" align="center" min-width="26px">
368 371
           <template slot-scope="scope">
369 372
             <span>{{ scope.row.name }}</span>
@@ -418,13 +421,7 @@
418 421
             </el-dropdown>
419 422
           </template>
420 423
         </el-table-column>
421
-        <el-table-column
422
-          prop="start_time"
423
-          align="center"
424
-          min-width="30px"
425
-          label="执行时间"
426
-          sortable
427
-        >
424
+        <el-table-column prop="start_time" align="center" min-width="30px" label="执行时间" sortable>
428 425
           <template slot-scope="scope">
429 426
             <span v-if="scope.row.execution_time != 0">
430 427
               {{scope.row.start_time | parseTime('{m}-{d} {h}:{i}')}}
@@ -448,13 +445,7 @@
448 445
             <span v-else></span>
449 446
           </template>
450 447
         </el-table-column>
451
-        <el-table-column
452
-          prop="check_time"
453
-          align="center"
454
-          min-width="30px"
455
-          label="校对时间"
456
-          sortable
457
-        >
448
+        <el-table-column prop="check_time" align="center" min-width="30px" label="校对时间" sortable>
458 449
           <template slot-scope="scope">
459 450
             <span v-if="scope.row.check_time != 0">
460 451
               {{scope.row.check_time | parseTime('{m}-{d} {h}:{i}')}}
@@ -467,13 +458,7 @@
467 458
             <span>{{ getXuserName(scope.row.advice_doctor) }}</span>
468 459
           </template>
469 460
         </el-table-column>
470
-        <el-table-column
471
-          prop="created_time"
472
-          align="center"
473
-          min-width="30px"
474
-          label="校对时间"
475
-          sortable
476
-        >
461
+        <el-table-column prop="created_time" align="center" min-width="30px" label="校对时间" sortable>
477 462
           <template slot-scope="scope">
478 463
             <span v-if="scope.row.created_time != 0">
479 464
               {{scope.row.created_time | parseTime('{m}-{d} {h}:{i}')}}
@@ -482,13 +467,7 @@
482 467
           </template>
483 468
         </el-table-column>
484 469
 
485
-       <el-table-column
486
-          prop="created_time"
487
-          align="center"
488
-          min-width="30px"
489
-          label="收费状态"
490
-          sortable
491
-        >
470
+       <el-table-column prop="created_time" align="center" min-width="30px" label="收费状态" sortable>
492 471
           <template slot-scope="scope">
493 472
             <span v-if="scope.row.is_settle == 1">
494 473
               已收费

+ 127 - 188
src/xt_pages/outpatientCharges/summary.vue Zobrazit soubor

@@ -4,41 +4,19 @@
4 4
       <bread-crumb :crumbs="crumbs"></bread-crumb>
5 5
     </div>
6 6
     <div class="app-container">
7
-      <div
8
-        style="
9
-          display: flex;
10
-          justify-content: space-between;
11
-          margin-bottom: 10px;
12
-        "
13
-      >
14
-        <div>
15
-          <!--<el-button size="small" style="margin-left:10px;" class="filter-item" type="primary"-->
16
-          <!--@click="Action">-->
17
-          <!--导出-->
18
-          <!--</el-button>-->
19
-          <el-input
20
-            size="small"
21
-            style="width: 150px"
22
-            v-model="keywords"
23
-            @input="searchAction"
7
+      <div style=" display: flex; justify-content: space-between;  margin-bottom: 10px;">
8
+        <div class="content_top" style="margin-right: 10px;">
9
+          <el-input  style="width: 120px"
10
+            v-model="keywords" @input="searchAction"
24 11
             @keyup.enter.native="searchAction"
25
-            class="filter-item"
26
-            placeholder="请输入患者姓名"
12
+            class="filter-item" placeholder="请输入患者姓名"
27 13
           />
28
-          <el-button
29
-            size="small"
30
-            style="margin-left: 10px"
31
-            class="filter-item"
32
-            type="primary"
33
-            @click="searchAction"
34
-          >
14
+          <el-button  class="filter-item" type="primary" @click="searchAction">
35 15
             搜索
36 16
           </el-button>
37
-          <el-select
38
-            size="small"
39
-            v-model="sort_type"
17
+          <el-select  v-model="sort_type"
40 18
             placeholder="请选择"
41
-            style="width: 150px; margin-left: 10px"
19
+            style="width: 120px;"
42 20
             @change="changeSortType"
43 21
           >
44 22
             <el-option
@@ -49,15 +27,14 @@
49 27
             >
50 28
             </el-option>
51 29
           </el-select>
52
-
53
-          <el-select v-model="sch_type" placeholder="请选择班次" @change="handleSchType">
30
+          <el-select v-model="sch_type" placeholder="请选择班次" @change="handleSchType" style="width: 120px;">
54 31
             <el-option label="全部" value="0"></el-option>
55 32
             <el-option label="上午" value="1"></el-option>
56 33
             <el-option label="下午" value="2"></el-option>
57 34
             <el-option label="晚上" value="3"></el-option>
58 35
           </el-select>
59 36
 
60
-          <el-select v-model="zoneVal" placeholder="请选择分区" style="margin-right:20px;" @change="handleZoneChange">
37
+          <el-select v-model="zoneVal" placeholder="请选择分区" style="width: 120px;" @change="handleZoneChange">
61 38
             <el-option
62 39
               v-for="item in zone_options"
63 40
               :key="item.id"
@@ -65,64 +42,11 @@
65 42
               :value="item.id">
66 43
             </el-option>
67 44
           </el-select>
68
-
69
-
70
-          <el-select v-model="medTypeVal" placeholder="请选择医疗类别" style="margin-right:20px;"
71
-                     @change="handleMedChange">
72
-            <el-option
73
-              v-for="item in med_options"
74
-              :key="item.id"
75
-              :label="item.text"
76
-              :value="item.id">
77
-            </el-option>
78
-          </el-select>
79
-
80
-          <!-- <el-date-picker
81
-              size="small"
82
-              v-model="start_time"
83
-              prefix-icon="el-icon-date"
84
-              @change="handleStartTimeChange"
85
-              :editable="false"
86
-              :clearable="false"
87
-              style="width: 196px; margin-right: 10px"
88
-              type="date"
89
-              placeholder="选择开始日期"
90
-              format="yyyy-MM-dd"
91
-              value-format="yyyy-MM-dd"
92
-              align="right"
93
-          ></el-date-picker>
94
-
95
-          <el-date-picker
96
-              size="small"
97
-              v-model="end_time"
98
-              prefix-icon="el-icon-date"
99
-              @change="handleEndTimeChange"
100
-              :editable="false"
101
-              :clearable="false"
102
-              style="width: 196px; margin-right: 10px"
103
-              type="date"
104
-              placeholder="选择结束日期"
105
-              format="yyyy-MM-dd"
106
-              value-format="yyyy-MM-dd"
107
-              align="right"
108
-          ></el-date-picker> -->
109 45
         </div>
110
-        <!-- 按钮 -->
111
-        <div>
112
-          <!-- <el-popover
113
-                      placement="bottom"
114
-                      width="210"
115
-                      trigger="click">
116
-                      <el-button size="small" ref="button_two" @click="open(1)">打印清单</el-button>
117
-                      <el-button size="small" ref="button_six" @click="open(2)">打印汇总</el-button>
118
-                      <el-button slot="reference" style="margin:0 10px;" type="primary" size="small">打印</el-button>
119
-
120
-                    </el-popover> -->
46
+        <div class="content_top">
121 47
           <el-button
122
-            size="small" type="primary" @click="query">查询
123
-          </el-button>
124
-          <el-button
125
-            v-if="$store.getters.xt_user.org_id == 10138 || $store.getters.xt_user.org_id == 10278 || $store.getters.xt_user.org_id == 10610 || $store.getters.xt_user.org_id == 0 "
48
+            v-if="$store.getters.xt_user.org_id == 10138 || $store.getters.xt_user.org_id == 10278 ||
49
+                $store.getters.xt_user.org_id == 10610 || $store.getters.xt_user.org_id == 0"
126 50
             size="small" type="primary" @click="batch_print_settlte">批量打印结算单
127 51
           </el-button>
128 52
           <el-button size="small" type="primary" @click="export_detail"
@@ -139,85 +63,82 @@
139 63
           <el-button size="small" type="primary"
140 64
                      @click="export_detail_ten_five">导出就诊凭证类型人员
141 65
           </el-button>
66
+        </div>
67
+      </div>
142 68
 
143
-          <!--                    <el-button  size="small" type="primary" @click="export_detail_ten_three">报表下载4</el-button>-->
144
-
69
+      <div style=" display: flex; justify-content: space-between;  margin-bottom: 10px;">
70
+        <div class="content_top" style="margin-right: 10px;">
71
+          <el-date-picker size="small" v-model="start_time" prefix-icon="el-icon-date" 
72
+            @change="handleStartTimeChange":editable="false" :clearable="false" 
73
+            style="width: 150px;"
74
+            type="date"
75
+            placeholder="选择开始日期"
76
+            format="yyyy-MM-dd"
77
+            value-format="yyyy-MM-dd"
78
+            align="right"
79
+          ></el-date-picker>
80
+          <span style="text-align: center;">-</span>
81
+          <el-date-picker
82
+            size="small"
83
+            v-model="end_time"
84
+            prefix-icon="el-icon-date"
85
+            @change="handleEndTimeChange"
86
+            :editable="false"
87
+            :clearable="false"
88
+            style="width: 150px; "
89
+            type="date"
90
+            placeholder="选择结束日期"
91
+            format="yyyy-MM-dd"
92
+            value-format="yyyy-MM-dd"
93
+            align="right"
94
+          ></el-date-picker>
145 95
 
146
-          <!--          <el-button size="small" type="primary" @click="export_detail_two"-->
147
-          <!--          >报表下载2-->
148
-          <!--          </el-button-->
149
-          <!--          >-->
96
+          <el-select size="small" v-model="staff" placeholder="请选择缴费人员"
97
+                   style="width:120px;" >
98
+            <el-option
99
+              v-for="item,index in admins"
100
+              :key="index"
101
+              :label="item.user_name"
102
+              :value="item.user_name">
103
+            </el-option>
104
+          </el-select>
150 105
 
106
+          <el-select v-model="medTypeVal" @change="handleMedChange"
107
+            placeholder="请选择医疗类别" style="width: 120px;"
108
+          >
109
+            <el-option
110
+              v-for="item in med_options"
111
+              :key="item.id"
112
+              :label="item.text"
113
+              :value="item.id">
114
+            </el-option>
115
+          </el-select>
116
+        </div>
117
+        <div class="content_button">
151 118
           <el-button size="small" type="primary" @click="export_detail_three" v-if="$store.getters.xt_user.org_id == 10265 || $store.getters.xt_user.org_id == 0">报表下载12</el-button>
152 119
           <el-button size="small" type="primary" @click="accounts_click()">门诊结账</el-button>
153
-          <!-- <el-button size="small" type="primary" @click="export_detail_four">报表下载3</el-button>-->
154
-          <!-- <el-button size="small" type="primary" @click="export_detail_five">报表下载3</el-button>-->
155
-                     <el-button size="small" type="primary" @click="export_detail_six">诊疗下载</el-button>
156
-          <!-- <el-button size="small" type="primary" @click="export_detail_tenone">报表下载10</el-button>-->
157
-          <!--  <el-button size="small" type="primary" @click="export_detail_seven">报表下载4</el-button>-->
158
-
159
-
120
+          <el-button size="small" type="primary" @click="export_detail_six">诊疗下载</el-button>
160 121
         </div>
161 122
       </div>
162
-      <div style="margin-bottom: 10px;">
163
-        <el-date-picker
164
-          size="small"
165
-          v-model="start_time"
166
-          prefix-icon="el-icon-date"
167
-          @change="handleStartTimeChange"
168
-          :editable="false"
169
-          :clearable="false"
170
-          style="width: 196px; "
171
-          type="date"
172
-          placeholder="选择开始日期"
173
-          format="yyyy-MM-dd"
174
-          value-format="yyyy-MM-dd"
175
-          align="right"
176
-        ></el-date-picker>
177
-        <span style="text-align: center;">-</span>
178
-        <el-date-picker
179
-          size="small"
180
-          v-model="end_time"
181
-          prefix-icon="el-icon-date"
182
-          @change="handleEndTimeChange"
183
-          :editable="false"
184
-          :clearable="false"
185
-          style="width: 196px; "
186
-          type="date"
187
-          placeholder="选择结束日期"
188
-          format="yyyy-MM-dd"
189
-          value-format="yyyy-MM-dd"
190
-          align="right"
191
-        ></el-date-picker>
192
-      </div>
193 123
 
194
-      <div style="margin-bottom: 10px;">
195
-        <el-date-picker
196
-          size="small"
197
-          v-model="pay_time"
198
-          prefix-icon="el-icon-date"
199
-          :editable="false"
200
-          :clearable="false"
201
-          style="width:250px; "
202
-          type="datetime"
203
-          placeholder="选择缴费日期"
204
-          format="yyyy-MM-dd HH:mm:ss"
205
-          value-format="yyyy-MM-dd HH:mm:ss"
206
-          align="right"
207
-        ></el-date-picker>
124
+      <div style=" display: flex; justify-content: space-between;  margin-bottom: 10px;">
125
+        <div class="content_top">
126
+          <el-date-picker size="small"
127
+            v-model="pay_time"
128
+            prefix-icon="el-icon-date"
129
+            :editable="false"
130
+            :clearable="false"
131
+            style="width:250px; "
132
+            type="datetime"
133
+            placeholder="选择缴费日期"
134
+            format="yyyy-MM-dd HH:mm:ss"
135
+            value-format="yyyy-MM-dd HH:mm:ss"
136
+            align="right"
137
+          ></el-date-picker>
138
+        </div>
139
+        <div class="content_top"></div>
208 140
       </div>
209 141
 
210
-      <div style="margin-bottom: 10px;">
211
-        <el-select size="small" v-model="staff" placeholder="请选择缴费人员"
212
-                   style="width:150px;margin-left:10px;" >
213
-          <el-option
214
-            v-for="item,index in admins"
215
-            :key="index"
216
-            :label="item.user_name"
217
-            :value="item.user_name">
218
-          </el-option>
219
-        </el-select>
220
-      </div>
221 142
 
222 143
       <el-table
223 144
         :data="tableData"
@@ -230,47 +151,48 @@
230 151
           color: '#606266',
231 152
         }"
232 153
         highlight-current-row
154
+        height="calc(100vh - 300px)"
233 155
       >
234 156
         <el-table-column align="center" type="selection" width="55"></el-table-column>
235 157
         <el-table-column
236 158
           prop="date"
237 159
           label="序号"
238
-          width="60"
160
+          width="40"
239 161
           align="center"
240 162
           type="index"
241 163
         >
242 164
         </el-table-column>
243
-        <el-table-column align="center" width="100" prop="name" label="就诊号">
165
+        <el-table-column align="center" width="80" prop="name" label="就诊号">
244 166
           <template slot-scope="scope">{{ scope.row.mdtrt_id }}</template>
245 167
         </el-table-column>
246
-        <el-table-column align="center" width="90" prop="name" label="患者名字">
168
+        <el-table-column align="center" width="80" prop="name" label="患者名字">
247 169
           <template slot-scope="scope">{{ scope.row.patient.name }}</template>
248 170
         </el-table-column>
249 171
 
250
-        <el-table-column align="center" width="90" prop="name" label="患者性别">
172
+        <el-table-column align="center" width="60" prop="name" label="患者性别">
251 173
           <template slot-scope="scope">{{ scope.row.patient.gender == 1 ? '男':'女' }}</template>
252 174
         </el-table-column>
253 175
 
254
-        <el-table-column align="center" width="90" prop="name" label="患者年龄">
176
+        <el-table-column align="center" width="60" prop="name" label="患者年龄">
255 177
           <template slot-scope="scope">{{getAge(scope.row.patient.id_card_no)}}</template>
256 178
         </el-table-column>
257 179
         <!--<el-table-column align="center" prop="name" label="患者类型">-->
258 180
         <!--<template slot-scope="scope"></template>-->
259 181
         <!--</el-table-column>-->
260 182
 
261
-        <el-table-column align="center" width="90" prop="name" label="应收金额">
183
+        <el-table-column align="center" width="80" prop="name" label="应收金额">
262 184
           <template slot-scope="scope">{{
263 185
               scope.row.medfee_sumamt.toFixed(2)
264 186
             }}
265 187
           </template>
266 188
         </el-table-column>
267
-        <el-table-column align="center" width="90" prop="name" label="实收金额">
189
+        <el-table-column align="center" width="80" prop="name" label="实收金额">
268 190
           <template slot-scope="scope">{{
269 191
               scope.row.medfee_sumamt.toFixed(2)
270 192
             }}
271 193
           </template>
272 194
         </el-table-column>
273
-        <el-table-column align="center" width="90" prop="name" label="科室">
195
+        <el-table-column align="center" width="70" prop="name" label="科室">
274 196
           <template slot-scope="scope">{{
275 197
               scope.row.department_name
276 198
             }}
@@ -282,12 +204,12 @@
282 204
           </template>
283 205
         </el-table-column>
284 206
 
285
-        <el-table-column align="center" width="90" prop="name" label="收费类型">
207
+        <el-table-column align="center" width="60" prop="name" label="收费类型">
286 208
           <template slot-scope="scope">
287
-            <div v-if="scope.row.is_medicine_insurance == 1">
209
+            <div v-if="scope.row.his_patient.balance_accounts_type != 2">
288 210
               医保
289 211
             </div>
290
-            <div v-if="scope.row.is_medicine_insurance != 1">
212
+            <div v-if="scope.row.his_patient.balance_accounts_type == 2">
291 213
               自费
292 214
             </div>
293 215
           </template>
@@ -320,12 +242,7 @@
320 242
           </template>
321 243
         </el-table-column>
322 244
 
323
-        <el-table-column
324
-          align="center"
325
-          width="100"
326
-          prop="name"
327
-          label="收费日期"
328
-        >
245
+        <el-table-column align="center" width="100" prop="name" label="收费日期">
329 246
           <template slot-scope="scope">
330 247
             {{
331 248
               scope.row.setl_time
@@ -334,13 +251,13 @@
334 251
             }}
335 252
           </template>
336 253
         </el-table-column>
337
-        <el-table-column align="center" width="90" prop="name" label="收费员">
254
+        <el-table-column align="center" width="70" prop="name" label="收费员">
338 255
           <template slot-scope="scope">{{
339 256
               getName(scope.row.creator)
340 257
             }}
341 258
           </template>
342 259
         </el-table-column>
343
-        <el-table-column align="center" width="80" prop="name" label="状态">
260
+        <el-table-column align="center" width="70" prop="name" label="状态">
344 261
           <template slot-scope="scope">
345 262
             <div v-if="scope.row.order_status == 1">待结算</div>
346 263
             <div v-if="scope.row.order_status == 2">已结算</div>
@@ -349,18 +266,19 @@
349 266
         </el-table-column>
350 267
         <el-table-column align="center" prop="name" label="操作">
351 268
           <template slot-scope="scope">
352
-            <el-button size="mini" type="primary" @click="toDetail(scope.row)"
269
+            <el-button class="butt_1" size="mini" type="primary" @click="toDetail(scope.row)"
353 270
             >详情
354 271
             </el-button
355 272
             >
356
-            <el-button size="mini" type="primary" @click="toPrint(scope.row)">
273
+            <el-button class="butt_2" size="mini" type="primary" @click="toPrint(scope.row)">
357 274
               结算单
358 275
             </el-button>
359
-            <el-button v-if="$store.getters.xt_user.org_id == 10191" size="mini" type="primary"
276
+            <el-button v-if="$store.getters.xt_user.org_id == 10191" class="butt_2" size="mini" type="primary"
360 277
                        @click="tolistPrint(scope.row)">
361 278
               结算清单
362 279
             </el-button>
363 280
             <el-button
281
+              class="butt_2"
364 282
               size="mini"
365 283
               type="primary"
366 284
               @click="uploadInfo(scope.row)"
@@ -371,6 +289,7 @@
371 289
             </el-button>
372 290
 
373 291
             <el-button
292
+              class="butt_2"
374 293
               size="mini"
375 294
               type="primary"
376 295
               @click="confirmUploadInfo(scope.row)"
@@ -380,6 +299,7 @@
380 299
             </el-button>
381 300
 
382 301
             <el-button
302
+              class="butt_2"
383 303
               size="mini"
384 304
               type="primary"
385 305
               @click="cancelUploadTwo(scope.row)"
@@ -389,6 +309,7 @@
389 309
             </el-button>
390 310
 
391 311
             <el-button
312
+              class="butt_2"
392 313
               size="mini"
393 314
               type="primary"
394 315
               @click="queryData(scope.row)"
@@ -397,8 +318,8 @@
397 318
               查询结算清单
398 319
             </el-button>
399 320
 
400
-
401 321
             <el-button
322
+              class="butt_2"
402 323
               size="mini"
403 324
               type="primary"
404 325
               @click="cancelUpload(scope.row)"
@@ -408,6 +329,7 @@
408 329
             </el-button>
409 330
 
410 331
             <el-button
332
+              class="butt_2"
411 333
               size="mini"
412 334
               type="primary"
413 335
               @click="cancelUploadThree(scope.row)"
@@ -415,6 +337,7 @@
415 337
               更改结算清单状态为未提交
416 338
             </el-button>
417 339
             <el-button
340
+              class="butt_2"
418 341
               size="mini"
419 342
               type="primary"
420 343
               v-if="
@@ -424,10 +347,11 @@
424 347
               @click="settlementPrint(scope.row)"
425 348
             >结算单
426 349
             </el-button>
427
-            <el-button size="mini" type="primary" @click="toRefund(scope.row)">
350
+            <el-button class="butt_2" size="mini" type="primary" @click="toRefund(scope.row)">
428 351
               退费
429 352
             </el-button>
430 353
             <el-button
354
+              class="butt_2"
431 355
               size="mini"
432 356
               type="primary"
433 357
               @click="invoicePrint(scope.row)"
@@ -3362,7 +3286,6 @@ export default {
3362 3286
           admin_user_id: this.$store.getters.xt_user.user.id
3363 3287
         }
3364 3288
         this.batchOrderObj = params
3365
-
3366 3289
       }
3367 3290
     },
3368 3291
     export_detail() {
@@ -3653,12 +3576,12 @@ export default {
3653 3576
     changeSortType() {
3654 3577
       this.page = 1
3655 3578
       this.keywords = ''
3656
-      // this.getHisOrderList()
3579
+      this.getHisOrderList()
3657 3580
     },
3658 3581
     changeDoctor() {
3659 3582
       this.page = 1
3660 3583
       this.keywords = ''
3661
-      // this.getHisOrderList()
3584
+      this.getHisOrderList()
3662 3585
     },
3663 3586
     handleSizeChange(limit) {
3664 3587
       this.limit = limit
@@ -3671,12 +3594,12 @@ export default {
3671 3594
     handleStartTimeChange() {
3672 3595
       this.page = 1
3673 3596
       this.keywords = ''
3674
-      // this.getHisOrderList()
3597
+      this.getHisOrderList()
3675 3598
     },
3676 3599
     handleEndTimeChange() {
3677 3600
       this.page = 1
3678 3601
       this.keywords = ''
3679
-      // this.getHisOrderList()
3602
+      this.getHisOrderList()
3680 3603
     },
3681 3604
     setMonthPrescription(month_prescriptions) {
3682 3605
       console.log(month_prescriptions)
@@ -3964,7 +3887,7 @@ export default {
3964 3887
       //   }
3965 3888
       //   this.tableData = arr
3966 3889
       // }
3967
-      // this.getHisOrderList()
3890
+      this.getHisOrderList()
3968 3891
     },
3969 3892
     getTimes(time) {
3970 3893
       return uParseTime(time, '{y}-{m}-{d}')
@@ -4124,4 +4047,20 @@ export default {
4124 4047
       padding:5px 0;
4125 4048
     }
4126 4049
   }
4050
+  .content_top{
4051
+    flex: 1; 
4052
+    display: flex;
4053
+    justify-content: space-between;
4054
+  }
4055
+  .content_button{
4056
+    flex: 1; 
4057
+    display: flex;
4058
+    justify-content:space-around;
4059
+  }
4060
+  .butt_1{
4061
+    margin-left:10px;
4062
+  }
4063
+  .butt_2{
4064
+    margin-top: 3px;
4065
+  }
4127 4066
 </style>

+ 1 - 1
src/xt_pages/user/templateSummary.vue Zobrazit soubor

@@ -121,7 +121,7 @@
121 121
         </div>
122 122
       </div>
123 123
 
124
-      <el-dialog title="新增阶段小结" width="80%" top="5vh" :visible.sync="show_dialog">
124
+      <el-dialog title="新增阶段小结" width="83%" top="5vh" :visible.sync="show_dialog">
125 125
         <div>
126 126
           <div class="new_record_form">
127 127
             <div class="cell clearfix">