Преглед на файлове

Merge branch 'superman' of http://git.shengws.com/zhangbj/xt_vue into superman

XMLWAN преди 4 години
родител
ревизия
7266e647a9

+ 1 - 1
src/api/dialysis.js Целия файл

@@ -148,7 +148,7 @@ export function postPrescription(params) {
148 148
   return request({
149 149
     url: '/api/dialysis/prescription',
150 150
     method: 'Post',
151
-    params: params
151
+    params: params,
152 152
   })
153 153
 }
154 154
 

+ 4 - 4
src/xt_pages/dialysis/batch_print/batch_print_order_other.vue Целия файл

@@ -21,7 +21,7 @@
21 21
             <div class="inline_block" style="margin-left: 5px;">
22 22
               住院号:
23 23
               <div class="under_line" style="width: 70px;text-align: left" v-if="record.receive_assessment.admission_number">
24
-                {{record.receive_assessment.admission_number}}
24
+                {{record.receive_assessment.condition == 1?record.receive_assessment.admission_number:'/'}}
25 25
               </div>
26 26
               <div class="under_line" style="width: 70px;" v-else>
27 27
                 {{'/'}}
@@ -383,7 +383,7 @@
383 383
               <div class="inline_block" style="margin-left: 5px;">
384 384
                 住院号:
385 385
                 <div class="under_line" style="width: 70px;text-align: left" v-if="record.receive_assessment.admission_number">
386
-                  {{record.receive_assessment.admission_number}}
386
+                  {{record.receive_assessment.condition == 1?record.receive_assessment.admission_number:'/'}}
387 387
                 </div>
388 388
                 <div class="under_line" style="width: 70px;" v-else>
389 389
                   {{'/'}}
@@ -694,7 +694,7 @@
694 694
             <div class="inline_block" style="margin-left: 5px;">
695 695
               住院号:
696 696
               <div class="under_line" style="width: 70px;text-align: left" v-if="record.receive_assessment.admission_number">
697
-                {{record.receive_assessment.admission_number}}
697
+                {{record.receive_assessment.condition == 1?record.receive_assessment.admission_number:'/'}}
698 698
               </div>
699 699
               <div class="under_line" style="width: 70px;" v-else>
700 700
                 {{'/'}}
@@ -1042,7 +1042,7 @@
1042 1042
                 <div class="inline_block" style="margin-left: 5px;">
1043 1043
                   住院号:
1044 1044
                   <div class="under_line" style="width: 70px;text-align: left" v-if="record.receive_assessment.admission_number">
1045
-                    {{record.receive_assessment.admission_number}}
1045
+                    {{record.receive_assessment.condition == 1?record.receive_assessment.admission_number:'/'}}
1046 1046
                   </div>
1047 1047
                   <div class="under_line" style="width: 70px;" v-else>
1048 1048
                     {{'/'}}

+ 2 - 2
src/xt_pages/dialysis/batch_print/batch_print_order_other_one.vue Целия файл

@@ -21,7 +21,7 @@
21 21
             <div class="inline_block" style="margin-left: 5px;">
22 22
               住院号:
23 23
               <div class="under_line" style="width: 70px;text-align: left" v-if="record.receive_assessment.admission_number">
24
-                {{record.receive_assessment.admission_number}}
24
+                {{record.receive_assessment.condition == 1?record.receive_assessment.admission_number:'/'}}
25 25
               </div>
26 26
               <div class="under_line" style="width: 70px;" v-else>
27 27
                 {{'/'}}
@@ -379,7 +379,7 @@
379 379
               <div class="inline_block" style="margin-left: 5px;">
380 380
                 住院号:
381 381
                 <div class="under_line" style="width: 70px;text-align: left" v-if="record.receive_assessment.admission_number">
382
-                  {{record.receive_assessment.admission_number}}
382
+                  {{record.receive_assessment.condition == 1?record.receive_assessment.admission_number:'/'}}
383 383
                 </div>
384 384
                 <div class="under_line" style="width: 70px;" v-else>
385 385
                   {{'/'}}

+ 2 - 2
src/xt_pages/dialysis/batch_print/batch_print_order_other_two.vue Целия файл

@@ -21,7 +21,7 @@
21 21
             <div class="inline_block" style="margin-left: 5px;">
22 22
               住院号:
23 23
               <div class="under_line" style="width: 70px;text-align: left" v-if="record.receive_assessment.admission_number">
24
-                {{record.receive_assessment.admission_number}}
24
+                {{record.receive_assessment.condition == 1?record.receive_assessment.admission_number:'/'}}
25 25
               </div>
26 26
               <div class="under_line" style="width: 70px;" v-else>
27 27
                 {{'/'}}
@@ -358,7 +358,7 @@
358 358
                 <div class="inline_block" style="margin-left: 5px;">
359 359
                   住院号:
360 360
                   <div class="under_line" style="width: 70px;text-align: left" v-if="record.receive_assessment.admission_number">
361
-                    {{record.receive_assessment.admission_number}}
361
+                    {{record.receive_assessment.condition == 1?record.receive_assessment.admission_number:'/'}}
362 362
                   </div>
363 363
                   <div class="under_line" style="width: 70px;" v-else>
364 364
                     {{'/'}}

+ 2 - 2
src/xt_pages/dialysis/bloodPresssWatch.1.vue Целия файл

@@ -128,12 +128,12 @@
128 128
 
129 129
         <el-table-column
130 130
           prop="dialysis_before_weight"
131
-          label="透前重 (kg)"
131
+          label="透前重 (kg)"
132 132
           align="center"
133 133
         ></el-table-column>
134 134
         <el-table-column
135 135
           prop="dialysis_after_weight"
136
-          label="透后重 (kg)"
136
+          label="透后重 (kg)"
137 137
           align="center"
138 138
         ></el-table-column>
139 139
         <el-table-column label="透中血压">

+ 2 - 2
src/xt_pages/dialysis/bloodPresssWatch.vue Целия файл

@@ -245,13 +245,13 @@
245 245
 
246 246
         <el-table-column
247 247
           prop="dialysis_before_weight"
248
-          label="透前重(kg)"
248
+          label="透前重(kg)"
249 249
           align="center"
250 250
           width="120"
251 251
         ></el-table-column>
252 252
         <el-table-column
253 253
           prop="dialysis_after_weight"
254
-          label="透后重(kg)"
254
+          label="透后重(kg)"
255 255
           align="center"
256 256
           width="120"
257 257
         ></el-table-column>

+ 2 - 2
src/xt_pages/dialysis/details/assessmentAfter.vue Целия файл

@@ -160,8 +160,8 @@
160 160
 
161 161
       </ul>
162 162
       <ul>
163
-        <li v-if="isShow('透后重')">
164
-          <label>透后重 : </label>
163
+        <li v-if="isShow('透后重')">
164
+          <label>透后重 : </label>
165 165
           <span class="content" v-if="weight_after!='0'">{{ weight_after }}</span>
166 166
           <span class="unit" v-if="weight_after!='0'">kg</span>
167 167
         </li>

+ 2 - 2
src/xt_pages/dialysis/details/assessmentBefore.vue Целия файл

@@ -3,8 +3,8 @@
3 3
     <h2 class="DetailsTit"><span>{{title}}</span></h2>
4 4
     <div class="plate " >
5 5
       <ul>
6
-        <li v-if="isShow('透前重')">
7
-          <label>透前重 : </label>
6
+        <li v-if="isShow('透前重')">
7
+          <label>透前重 : </label>
8 8
           <span class="content" v-if="weight_before!='0'">{{ weight_before }}</span>
9 9
           <span class="unit" v-if="weight_before!='0'">kg</span>
10 10
         </li>

+ 2 - 2
src/xt_pages/dialysis/details/dialog/AssessmentAfterDislysis.vue Целия файл

@@ -41,8 +41,8 @@
41 41
           </el-col>
42 42
 
43 43
 
44
-          <el-col :span="8" v-if="isShow('透后重')">
45
-            <el-form-item label="透后重(kg): " >
44
+          <el-col :span="8" v-if="isShow('透后重')">
45
+            <el-form-item label="透后重(kg): " >
46 46
               <el-input v-model="form.weight_after"></el-input>
47 47
             </el-form-item>
48 48
           </el-col>

+ 3 - 3
src/xt_pages/dialysis/details/dialog/MsgTip.vue Целия файл

@@ -26,7 +26,7 @@
26 26
           </div>
27 27
         </div>
28 28
         <div class="item">
29
-          <label class="name" for="txms">透前重(kg)</label>
29
+          <label class="name" for="txms">透前重(kg)</label>
30 30
           <div class="content">
31 31
             <span class="text" id="txms">{{ predialysis.weight_before }}</span>
32 32
           </div>
@@ -54,7 +54,7 @@
54 54
           </div>
55 55
         </div>
56 56
         <div class="item">
57
-          <label class="name" for="txms">透后重(kg)</label>
57
+          <label class="name" for="txms">透后重(kg)</label>
58 58
           <div class="content">
59 59
             <span class="text" id="txms">{{ record.weight_after }}</span>
60 60
           </div>
@@ -66,7 +66,7 @@
66 66
           </div>
67 67
         </div>
68 68
         <div class="item">
69
-          <label class="name" for="txms">上次透后重(kg)</label>
69
+          <label class="name" for="txms">上次透后重(kg)</label>
70 70
           <div class="content">
71 71
             <span class="text" id="txms">{{ last_record.weight_after }}</span>
72 72
           </div>

+ 2 - 2
src/xt_pages/dialysis/details/dialog/assessmentBeforeDislysisDialog.vue Целия файл

@@ -23,7 +23,7 @@
23 23
       <el-form ref="assessmentBeforeDislysis" :model="assessmentBeforeDislysis" label-width="125px">
24 24
         <el-row :gutter="24">
25 25
           <el-col :span="8">
26
-            <el-form-item label="透前体重(kg): " v-if="isShow('透前体重')">
26
+            <el-form-item label="透前称重(kg): " v-if="isShow('透前称重')">
27 27
               <el-input type="number" v-model="assessmentBeforeDislysis.weight_before"></el-input>
28 28
             </el-form-item>
29 29
           </el-col>
@@ -165,7 +165,7 @@
165 165
               <el-select v-model="assessmentBeforeDislysis.blood_access_part_opera_id">
166 166
                 <el-option :key="0" label="请选择" :value="0"></el-option>
167 167
 
168
-                <el-option v-for="item in 8" :label="item.name" :value="item.id"
168
+                <el-option v-for="item in blood_access_part_opera" :label="item.name" :value="item.id"
169 169
                            :key="item.id"></el-option>
170 170
               </el-select>
171 171
             </el-form-item>

+ 3 - 3
src/xt_pages/dialysis/details/dialog/dialysisPrescriptionDialog.vue Целия файл

@@ -502,7 +502,7 @@
502 502
         <span>{{dialysis_date}}</span>
503 503
       </div>
504 504
       <div class="newLine">
505
-        <span>透前重(kg)</span>
505
+        <span>透前重(kg)</span>
506 506
         <span>{{ getBeforeWeight(predialysis)}}</span>
507 507
       </div>
508 508
       <div class="newLine">
@@ -520,7 +520,7 @@
520 520
         <span>{{ add_weight }}</span>
521 521
       </div>
522 522
       <div class="newLine">
523
-        <span>透后重(kg)</span>
523
+        <span>透后重(kg)</span>
524 524
         <span>{{ getAfterWeight(record) }}</span>
525 525
       </div>
526 526
       <div class="newLine">
@@ -528,7 +528,7 @@
528 528
         <span>{{ record.weight_loss }}</span>
529 529
       </div>
530 530
       <div class="newLine">
531
-        <span>上次透后重(kg)</span>
531
+        <span>上次透后重(kg)</span>
532 532
         <span>{{getLastAfterWeight(last_record)}}</span>
533 533
       </div>
534 534
 

+ 6 - 6
src/xt_pages/dialysis/details/pastData.vue Целия файл

@@ -1,12 +1,12 @@
1 1
 <template>
2 2
    <div class="plate-box">
3 3
     <h2 class="DetailsTit"><span>{{title}}</span></h2>
4
-    <div class="tableTit " >   
4
+    <div class="tableTit " >
5 5
         <ul>
6 6
              <li v-for="(item,index) in tableTit" :key="index" :value="item.value" >{{item}}</li>
7 7
         </ul>
8 8
     </div>
9
-    <div class="tableDate" >   
9
+    <div class="tableDate" >
10 10
         <ul>
11 11
              <li v-for="(item,index) in tableDate" :key="index" :value="item.value" >
12 12
                <span>{{item.data}}</span>
@@ -18,8 +18,8 @@
18 18
              </li>
19 19
         </ul>
20 20
     </div>
21
-    <div class="middleLine"></div>    
22
-  </div>    
21
+    <div class="middleLine"></div>
22
+  </div>
23 23
 </template>
24 24
 
25 25
 <script>
@@ -31,8 +31,8 @@ export default {
31 31
       tableTit: [
32 32
         "日期",
33 33
         "透析模式",
34
-        "透前重(kg)",
35
-        "透后重(kg)",
34
+        "透前重(kg)",
35
+        "透后重(kg)",
36 36
         "设定脱水(L)",
37 37
         "实际脱水(L)"
38 38
       ],

+ 3 - 3
src/xt_pages/dialysis/dialysisPage.vue Целия файл

@@ -715,7 +715,7 @@
715 715
                   <table class="dan-table" style="margin-top: 0px;">
716 716
                     <tbody>
717 717
                     <tr>
718
-                      <td class="dan-td-col-4">透前重</td>
718
+                      <td class="dan-td-col-4">透前重</td>
719 719
                       <td class="dan-td">
720 720
                         <div class="dan-value"><b class="print-b">{{danPrintData.weight_before}}</b></div>
721 721
                       </td>
@@ -1072,7 +1072,7 @@
1072 1072
                   </el-form-item>
1073 1073
                 </el-col>
1074 1074
                 <el-col :span="size">
1075
-                  <el-form-item label="透前重(kg):">
1075
+                  <el-form-item label="透前重(kg):">
1076 1076
                     <el-input v-model="dialysisBeforeAsses.dialysisbeforeWeight"></el-input>
1077 1077
                   </el-form-item>
1078 1078
                 </el-col>
@@ -1482,7 +1482,7 @@
1482 1482
 
1483 1483
 
1484 1484
                 <el-col :span="size">
1485
-                  <el-form-item label="透后重(kg):">
1485
+                  <el-form-item label="透后重(kg):">
1486 1486
                     <el-input v-model="dialysisAfterAsses.weightAfterDialysi"></el-input>
1487 1487
                   </el-form-item>
1488 1488
                 </el-col>

+ 8 - 8
src/xt_pages/dialysis/order.html Целия файл

@@ -1,7 +1,7 @@
1 1
 <style>
2 2
     .dialysis-print-order{
3 3
     width:960px; margin:0 auto
4
-} 
4
+}
5 5
 
6 6
 .dialysis-print-order .order-yy-name{
7 7
     margin: auto;
@@ -238,7 +238,7 @@
238 238
                                         <table class="table-box">
239 239
                                             <tbody>
240 240
                                                 <tr>
241
-                                                    <td width="90">透前重:</td>
241
+                                                    <td width="90">透前重:</td>
242 242
                                                     <td width="">
243 243
                                                         <div class="under-line">&nbsp;{{predialysis.weight_before}}</div>
244 244
                                                     </td>
@@ -358,7 +358,7 @@
358 358
                                     </td>
359 359
                                 </tr>
360 360
                                 <tr>
361
-                                    
361
+
362 362
                                     <td>
363 363
                                         <table class="table-box">
364 364
                                             <tbody>
@@ -554,7 +554,7 @@
554 554
                                         <div class="under-line">&nbsp;{{prescription.bicarbonate}}</div>
555 555
                                     </td>
556 556
                                     <td width="75">mmol/L</td>
557
-                                    
557
+
558 558
                                 </tr>
559 559
                             </tbody>
560 560
                         </table>
@@ -582,7 +582,7 @@
582 582
                 </tr>
583 583
                 <tr v-for="advice in advices" :key="advice.id">
584 584
                     <td> {{advice.start_time | parseTime('{y}-{m}-{d} {h}:{i}')}}</td>
585
-                    <td> 
585
+                    <td>
586 586
                         <span v-if="advice.parent_id>0">└</span>
587 587
                         <span >{{advice.advice_name }}</span>
588 588
                         <span >{{advice.advice_desc}}</span>
@@ -621,7 +621,7 @@
621 621
                     <td >透析液温度<font size="2"> (℃)</font></td>
622 622
                     <td >置换率<font size="2"> (ml/min)</font></td>
623 623
                     <td >置换量<font size="2"> (L)</font></td>
624
-                    
624
+
625 625
                     <td width="" style="min-width:45px;">病情变化</td>
626 626
                     <td width="" style="min-width:120px;">处理</td>
627 627
                     <td width="" style="min-width:45px;">结果</td>
@@ -645,7 +645,7 @@
645 645
                 </tr>
646 646
             </tbody>
647 647
         </table>
648
-        
648
+
649 649
         <table class="print-table" border="1">
650 650
             <tbody>
651 651
                 <tr>
@@ -711,4 +711,4 @@
711 711
             </tbody>
712 712
         </table>
713 713
     </div>
714
-</div>
714
+</div>

+ 5 - 5
src/xt_pages/dialysis/template/dialysisPrintOrderTwo.vue Целия файл

@@ -13,7 +13,7 @@
13 13
         <div class="inline_block" style="margin-left: 5px;">
14 14
           住院号:
15 15
           <div class="under_line" style="width: 70px;text-align: left" v-if="receiverTreatmentAccess.admission_number">
16
-            {{receiverTreatmentAccess.admission_number}}
16
+            {{patientInfo_source_2?receiverTreatmentAccess.admission_number: '/'}}
17 17
           </div>
18 18
           <div class="under_line" style="width: 70px;text-align: left" v-else>
19 19
             {{'/'}}
@@ -305,7 +305,7 @@
305 305
           <div class="inline_block" style="margin-left: 5px;">
306 306
             住院号:
307 307
             <div class="under_line" style="width: 70px;text-align: left" v-if="receiverTreatmentAccess.admission_number">
308
-              {{receiverTreatmentAccess.admission_number}}
308
+              {{patientInfo_source_2?receiverTreatmentAccess.admission_number:'/'}}
309 309
             </div>
310 310
             <div class="under_line" style="width: 70px;text-align: left" v-else>
311 311
               {{'/'}}
@@ -601,7 +601,7 @@
601 601
         <div class="inline_block" style="margin-left: 5px;">
602 602
           住院号:
603 603
           <div class="under_line" style="width: 70px;text-align: left" v-if="receiverTreatmentAccess.admission_number">
604
-            {{receiverTreatmentAccess.admission_number}}
604
+            {{patientInfo_source_2?receiverTreatmentAccess.admission_number:'/'}}
605 605
           </div>
606 606
           <div class="under_line" style="width: 70px;text-align: left" v-else>
607 607
             {{'/'}}
@@ -820,7 +820,7 @@
820 820
             </div>
821 821
             <div class="row" style="padding: 2px 0;line-height:24px;">
822 822
               <div class="inline_block">
823
-                透前重:
823
+                透前重:
824 824
                 <div class="under_line" style="width: 70px;text-align: left" v-if="predialysis.weight_before">
825 825
                   {{predialysis.weight_before}}
826 826
                 </div>
@@ -940,7 +940,7 @@
940 940
             <div class="inline_block" style="margin-left: 5px;">
941 941
               住院号:
942 942
               <div class="under_line" style="width: 70px;text-align: left" v-if="receiverTreatmentAccess.admission_number">
943
-                {{receiverTreatmentAccess.admission_number}}
943
+                {{patientInfo_source_2?receiverTreatmentAccess.admission_number:'/'}}
944 944
               </div>
945 945
               <div class="under_line" style="width: 70px;text-align: left" v-else>
946 946
                 {{'/'}}

+ 16 - 16
src/xt_pages/qcd/patientAnalysis/person/oralMedicine.vue Целия файл

@@ -7,7 +7,7 @@
7 7
       <person-info :patient="patientInfo"></person-info>
8 8
       <person-nav activeName="oralmedicine" :patientID="patientID"></person-nav>
9 9
 
10
-      
10
+
11 11
       <div class="cell clearfix">
12 12
         <label class="title">
13 13
           <span class="name">日期查询</span> :
@@ -38,7 +38,7 @@
38 38
           value-format="yyyy-MM-dd"
39 39
         ></el-date-picker>
40 40
       </div>
41
-      
41
+
42 42
       <div class="cell clearfix">
43 43
         <label class="title">
44 44
           <span class="name">医嘱类型</span> :
@@ -67,7 +67,7 @@
67 67
           </el-option>
68 68
         </el-select>
69 69
       </div> -->
70
-      
70
+
71 71
       <!-- <div class="cqd-dataTitle">统计图</div>
72 72
       <el-row :gutter="32">
73 73
         <el-col :xs="24" :sm="24" :lg="24">
@@ -88,7 +88,7 @@
88 88
         :cell-style="cellstyle"
89 89
         style="width: 100%;margin-top: 10px;"
90 90
         id="qcd-person-oral-medical"
91
-        :span-method="mergeSpan" 
91
+        :span-method="mergeSpan"
92 92
         :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)'}"
93 93
       >
94 94
         <el-table-column  label="医嘱类型" width="80" property="advice_type" align="center" >
@@ -98,13 +98,13 @@
98 98
                 <span v-else></span>
99 99
             </template>
100 100
         </el-table-column>
101
-        
101
+
102 102
         <el-table-column  label="医嘱内容" property="advice_name" min-width="180" align="center" >
103 103
             <template slot-scope="scope">
104 104
                {{scope.row.parent_id>0?'&nbsp;&nbsp;':''}} {{scope.row.advice_name }}
105 105
             </template>
106 106
         </el-table-column>
107
-        
107
+
108 108
         <el-table-column  label="开始时间" width="180" property="start_time" align="center">
109 109
             <template slot-scope="scope">
110 110
                 {{scope.row.start_time | parseTime("{y}-{m}-{d} {h}:{i}")}}
@@ -116,19 +116,19 @@
116 116
                 <span v-if="scope.row.advice_type==1&&scope.row.stop_state==1"> {{scope.row.stop_time | parseTime("{y}-{m}-{d} {h}:{i}")}}</span>
117 117
             </template>
118 118
         </el-table-column>
119
-        
119
+
120 120
         <el-table-column label="开嘱医生" width="180"  property="advice_doctor" align="center">
121 121
             <template slot-scope="scope">
122 122
                 {{getXuserName(scope.row.advice_doctor)}}
123 123
             </template>
124 124
         </el-table-column>
125
-        
125
+
126 126
         <el-table-column  label="执行护士" width="180"  property="execution_staff" align="center">
127 127
             <template slot-scope="scope">
128 128
                 <span v-if="scope.row.parent_id==0">{{getXuserName(scope.row.execution_staff)}}</span>
129 129
             </template>
130 130
         </el-table-column>
131
-        
131
+
132 132
       </el-table>
133 133
 
134 134
       <!-- <pagi-nation title="分页"></pagi-nation> -->
@@ -225,7 +225,7 @@ export default {
225 225
       (nowMonth < 10 ? "0" + nowMonth : nowMonth) +
226 226
       "-" +
227 227
       (nowDay < 10 ? "0" + nowDay : nowDay);
228
-    
228
+
229 229
     this.getList();
230 230
   },
231 231
   methods: {
@@ -259,7 +259,7 @@ export default {
259 259
       }
260 260
       return '';
261 261
     },
262
-    
262
+
263 263
     handleTableRow() {
264 264
       this.tableRow = [];
265 265
       var pos = 0;
@@ -311,7 +311,7 @@ export default {
311 311
         }
312 312
         return ""
313 313
     },
314
-    
314
+
315 315
     getXuserName(id) {
316 316
       if (id <= 0) {
317 317
         return "";
@@ -387,10 +387,10 @@ export default {
387 387
       }
388 388
 
389 389
       if (this.diagramType == 1) {
390
-        this.CompletionOptions.legend = ['透前体重', '透后体重', '干体重'];
390
+        this.CompletionOptions.legend = ['透前称重', '透后称重', '干体重'];
391 391
         this.CompletionOptions.series = [
392
-          { name:'透前重', type:'line', data:[] },
393
-          { name:'透后重', type:'line', data:[] },
392
+          { name:'透前重', type:'line', data:[] },
393
+          { name:'透后重', type:'line', data:[] },
394 394
           { name:'干体重', type:'line', data:[] },
395 395
         ];
396 396
       }else {
@@ -531,4 +531,4 @@ export default {
531 531
     }
532 532
   }
533 533
 }
534
-</style>
534
+</style>

+ 12 - 12
src/xt_pages/qcd/patientAnalysis/person/weight.vue Целия файл

@@ -7,7 +7,7 @@
7 7
       <person-info :patient="patientInfo"></person-info>
8 8
       <person-nav activeName="weight" :patientID="patientID"></person-nav>
9 9
 
10
-      
10
+
11 11
       <div class="cell clearfix">
12 12
         <label class="title">
13 13
           <span class="name">日期查询</span> :
@@ -38,7 +38,7 @@
38 38
           value-format="yyyy-MM-dd"
39 39
         ></el-date-picker>
40 40
       </div>
41
-      
41
+
42 42
       <div class="cell clearfix">
43 43
         <label class="title">
44 44
           <span class="name">曲线图</span> :
@@ -54,7 +54,7 @@
54 54
           </ul>
55 55
         </div>
56 56
       </div>
57
-      
57
+
58 58
       <div class="cqd-dataTitle">统计图</div>
59 59
       <el-row :gutter="32">
60 60
         <el-col :xs="24" :sm="24" :lg="24">
@@ -75,23 +75,23 @@
75 75
         style="width: 100%;margin-top: 10px;"
76 76
         :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)'}"
77 77
       >
78
-        
78
+
79 79
         <el-table-column  label="透析日期" min-width="80" property="schedule_date" align="center">
80 80
           <template slot-scope="scope"><span>{{getTime(scope.row.schedule_date, '{y}{m}{d}')}}</span></template>
81 81
         </el-table-column>
82 82
         <el-table-column  label="干体重" min-width="80" property="assessment_before_dislysis" align="center">
83 83
           <template slot-scope="scope"><span>{{scope.row.assessment_before_dislysis?scope.row.assessment_before_dislysis.dry_weight + 'Kg':'--'}}</span></template>
84 84
         </el-table-column>
85
-        <el-table-column  label="透前重" min-width="80" property="assessment_before_dislysis" align="center">
85
+        <el-table-column  label="透前重" min-width="80" property="assessment_before_dislysis" align="center">
86 86
           <template slot-scope="scope"><span>{{scope.row.assessment_before_dislysis?scope.row.assessment_before_dislysis.weight_before + 'Kg':'--'}}</span></template>
87 87
         </el-table-column>
88 88
         <el-table-column  label="体重增加" min-width="80" property="assessment_before_dislysis" align="center">
89 89
           <template slot-scope="scope"><span>{{scope.row.assessment_before_dislysis?scope.row.assessment_before_dislysis.weight_before - scope.row.assessment_before_dislysis.dry_weight + 'Kg':'--'}}</span></template>
90 90
         </el-table-column>
91
-        <el-table-column  label="透后重" min-width="80" property="assessment_after_dislysis" align="center">
91
+        <el-table-column  label="透后重" min-width="80" property="assessment_after_dislysis" align="center">
92 92
           <template slot-scope="scope"><span>{{scope.row.assessment_after_dislysis?scope.row.assessment_after_dislysis.weight_after+ 'Kg':'--'}}</span></template>
93 93
         </el-table-column>
94
-        
94
+
95 95
       </el-table>
96 96
 
97 97
       <!-- <pagi-nation title="分页"></pagi-nation> -->
@@ -184,7 +184,7 @@ export default {
184 184
       (nowMonth < 10 ? "0" + nowMonth : nowMonth) +
185 185
       "-" +
186 186
       (nowDay < 10 ? "0" + nowDay : nowDay);
187
-    
187
+
188 188
     this.getList();
189 189
   },
190 190
   methods: {
@@ -297,10 +297,10 @@ export default {
297 297
       }
298 298
 
299 299
       if (this.diagramType == 1) {
300
-        this.CompletionOptions.legend = ['透前体重', '透后体重', '干体重'];
300
+        this.CompletionOptions.legend = ['透前称重', '透后称重', '干体重'];
301 301
         this.CompletionOptions.series = [
302
-          { name:'透前重', type:'line', data:[] },
303
-          { name:'透后重', type:'line', data:[] },
302
+          { name:'透前重', type:'line', data:[] },
303
+          { name:'透后重', type:'line', data:[] },
304 304
           { name:'干体重', type:'line', data:[] },
305 305
         ];
306 306
       }else {
@@ -438,4 +438,4 @@ export default {
438 438
     }
439 439
   }
440 440
 }
441
-</style>
441
+</style>

+ 8 - 8
src/xt_pages/qcd/patientAnalysis/weight.vue Целия файл

@@ -82,7 +82,7 @@
82 82
         </el-col>
83 83
         <el-col :xs="24" :sm="24" :lg="8">
84 84
           <div class="chart-wrapper">
85
-              <pie-chart title="透后重(人次)" :options="WeightAfterOptions"/>
85
+              <pie-chart title="透后重(人次)" :options="WeightAfterOptions"/>
86 86
           </div>
87 87
         </el-col>
88 88
       </el-row>
@@ -98,7 +98,7 @@
98 98
         style="width: 100%;margin-top: 10px;"
99 99
         :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)'}"
100 100
       >
101
-      
101
+
102 102
         <el-table-column  label="透析日期" min-width="80" property="schedule_date" align="center">
103 103
           <template slot-scope="scope"><span>{{getTime(scope.row.schedule_date, '{y}{m}{d}')}}</span></template>
104 104
         </el-table-column>
@@ -120,16 +120,16 @@
120 120
         <el-table-column  label="干体重" min-width="80" property="assessment_before_dislysis" align="center">
121 121
           <template slot-scope="scope"><span>{{scope.row.assessment_before_dislysis?scope.row.assessment_before_dislysis.dry_weight + 'Kg':'--'}}</span></template>
122 122
         </el-table-column>
123
-        <el-table-column  label="透前重" min-width="80" property="assessment_before_dislysis" align="center">
123
+        <el-table-column  label="透前重" min-width="80" property="assessment_before_dislysis" align="center">
124 124
           <template slot-scope="scope"><span>{{scope.row.assessment_before_dislysis?scope.row.assessment_before_dislysis.weight_before + 'Kg':'--'}}</span></template>
125 125
         </el-table-column>
126 126
         <el-table-column  label="体重增加" min-width="80" property="assessment_before_dislysis" align="center">
127 127
           <template slot-scope="scope"><span>{{scope.row.assessment_before_dislysis?scope.row.assessment_before_dislysis.weight_before - scope.row.assessment_before_dislysis.dry_weight + 'Kg':'--'}}</span></template>
128 128
         </el-table-column>
129
-        <el-table-column  label="透后重" min-width="80" property="assessment_after_dislysis" align="center">
129
+        <el-table-column  label="透后重" min-width="80" property="assessment_after_dislysis" align="center">
130 130
           <template slot-scope="scope"><span>{{scope.row.assessment_after_dislysis?scope.row.assessment_after_dislysis.weight_after+ 'Kg':'--'}}</span></template>
131 131
         </el-table-column>
132
-        
132
+
133 133
         <el-table-column  label="统计" min-width="80" property="patient" align="center">
134 134
           <template slot-scope="scope">
135 135
             <el-tooltip class="item" effect="dark" content="统计" placement="top">
@@ -362,7 +362,7 @@ export default {
362 362
               });
363 363
             }
364 364
 
365
-            
365
+
366 366
         }
367 367
       });
368 368
     },
@@ -390,7 +390,7 @@ export default {
390 390
       this.listQuery.age = age;
391 391
       this.getList();
392 392
     },
393
-    
393
+
394 394
     getTime(value, temp) {
395 395
         if (value != undefined) {
396 396
           return uParseTime(value, temp)
@@ -526,4 +526,4 @@ export default {
526 526
     }
527 527
   }
528 528
 }
529
-</style>
529
+</style>

+ 1 - 1
src/xt_pages/sign/index.vue Целия файл

@@ -64,7 +64,7 @@
64 64
                    </div>
65 65
                     <div class="border"></div>
66 66
                     <div style="margin-bottom:20px;color:rgb(96,96,96);font-size:14px">
67
-                    透前重(kg):&nbsp;<el-input v-model="weigh_list.weight_before" :disabled="disa" style="width:200px"></el-input> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
67
+                    透前重(kg):&nbsp;<el-input v-model="weigh_list.weight_before" :disabled="disa" style="width:200px"></el-input> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
68 68
                     干体重(kg):&nbsp;<el-input v-model="weigh_list.dry_weight" :disabled="true" style="width:200px"></el-input><br>
69 69
                     </div>
70 70
                     <div style="margin-bottom:12px;color:rgb(96,96,96);font-size:14px">

+ 4 - 4
src/xt_pages/user/dialysisRecord.vue Целия файл

@@ -153,14 +153,14 @@
153 153
             prop="predialysis_evaluation.weight_before"
154 154
             width="110"
155 155
             align="center"
156
-            label="透前重(kg)"
156
+            label="透前重(kg)"
157 157
           >
158 158
           </el-table-column>
159 159
           <el-table-column
160 160
             prop="assessment_after_dislysis.weight_after"
161 161
             width="110"
162 162
             align="center"
163
-            label="透后重(kg)"
163
+            label="透后重(kg)"
164 164
           >
165 165
           </el-table-column>
166 166
           <el-table-column
@@ -299,8 +299,8 @@
299 299
               <th>透析模式</th>
300 300
               <th>透析时长(h)</th>
301 301
               <th>干体重(kg)</th>
302
-              <th>透前重(kg)</th>
303
-              <th>透后重(kg)</th>
302
+              <th>透前重(kg)</th>
303
+              <th>透后重(kg)</th>
304 304
               <th>透前血压(mmhg)</th>
305 305
               <th>透后血压(mmhg)</th>
306 306
               <th>超滤总量(L)</th>