浏览代码

Merge branch '20230223_pc_vue_new_branch' of http://git.shengws.com/csx/Vue_New into 20230223_pc_vue_new_branch

杨青 2 年前
父节点
当前提交
7a2aba7ac8

+ 47 - 1
src/xt_pages/dialysis/batch_print/batch_print_order_six.vue 查看文件

@@ -823,6 +823,21 @@
823 823
                           }}
824 824
                         </div>
825 825
                       </div>
826
+
827
+                      <div class="inline_block" style="flex: 1" v-if="org_id ==0 || org_id ==10440">
828
+                        衣物重:
829
+                        <div
830
+                          class="under_line"
831
+                          style="width: 70px; text-align: center"
832
+                        >
833
+                          {{
834
+                            record.assessment_before_dislysis &&
835
+                            record.assessment_before_dislysis.additional_weight
836
+                              ? record.assessment_before_dislysis.additional_weight
837
+                              : "/"
838
+                          }}
839
+                        </div>
840
+                      </div>
826 841
                       <div
827 842
                         class="inline_block"
828 843
                         style="flex: 1"
@@ -874,10 +889,12 @@
874 889
                     </div>
875 890
 
876 891
                     <div
892
+                    
877 893
                       class="row"
878 894
                       style="padding: 2px 0; line-height: 23px; display: flex"
879 895
                     >
880
-                      <div class="inline_block" style="flex: 1">
896
+                      <div class="inline_block" style="flex: 1"
897
+                        v-if="org_id!=10440 && org_id !=0">
881 898
                         上次透后体重:
882 899
                         <div
883 900
                           class="under_line"
@@ -2442,6 +2459,35 @@
2442 2459
                           }}
2443 2460
                         </div>
2444 2461
                       </div>
2462
+                    </div>
2463
+                     <div
2464
+                     v-if="org_id ==0 || org_id ==10440"
2465
+                      class="row"
2466
+                      style="padding: 2px 0; line-height: 23px; display: flex"
2467
+                    >
2468
+                      <div
2469
+                        class="inline_block"
2470
+                        style="flex: 1; display: inline-block"
2471
+                      >
2472
+                        衣物重:
2473
+                        <div
2474
+                          class="under_line"
2475
+                          style="
2476
+                            width: 100px;
2477
+                            line-height: 25px;
2478
+                            text-align: left;
2479
+                            margin-left: 2px;
2480
+                            display: inline-block;
2481
+                            white-space: normal;
2482
+                          "
2483
+                        >
2484
+                          {{
2485
+                            record.assessment_after_dislysis && record.assessment_after_dislysis.additional_weight
2486
+                              ? record.assessment_after_dislysis.additional_weight
2487
+                              : "/"
2488
+                          }}
2489
+                        </div>
2490
+                      </div>
2445 2491
                     </div>
2446 2492
                     <div
2447 2493
                       class="row"

+ 21 - 15
src/xt_pages/dialysis/details/dialog/monitor_dialog.vue 查看文件

@@ -236,10 +236,11 @@
236 236
                 template_id == 56 ||
237 237
                 template_id == 60 ||
238 238
                 org_id == 10210 ||
239
-                org_id == 9555 || org_id == 10387
239
+                org_id == 9555 
240 240
                 || org_id == 10432
241 241
                 || org_id == 10445
242
-                || org_id == 10410)
242
+                || org_id == 10410) &&
243
+                org_id!=10387
243 244
             "
244 245
           >
245 246
             <template slot-scope="scope">
@@ -266,7 +267,7 @@
266 267
             width="110"
267 268
             v-if="
268 269
               isShow('超滤量') &&
269
-              template_id != 6 &&
270
+              (template_id != 6 &&
270 271
               template_id != 9 &&
271 272
               template_id != 10 &&
272 273
               template_id != 11 &&
@@ -304,9 +305,10 @@
304 305
               template_id != 56 &&
305 306
               template_id != 60 &&
306 307
               org_id!= 10210 &&
307
-              org_id != 9555 && org_id!=10387
308
+              org_id != 9555 
308 309
               && org_id!=10432 && org_id!=10445
309
-              && org_id!=10410
310
+              && org_id!=10410)
311
+              || org_id == 10387
310 312
             "
311 313
           >
312 314
             <template slot-scope="scope">
@@ -358,6 +360,7 @@
358 360
                 org_id == 10432 ||
359 361
                 org_id == 10445 ||
360 362
                 org_id == 10410)
363
+                && org_id!=10387
361 364
             "
362 365
           >
363 366
             <template slot-scope="scope">
@@ -375,7 +378,7 @@
375 378
             width="100"
376 379
             v-if="
377 380
               isShow('超滤率') &&
378
-              template_id != 6 &&
381
+              (template_id != 6 &&
379 382
               template_id != 10 &&
380 383
               template_id != 11 &&
381 384
               template_id != 12 &&
@@ -407,7 +410,8 @@
407 410
               template_id != 60 &&
408 411
               org_id!=10432 &&
409 412
               org_id!=10445 &&
410
-              org_id!=10410
413
+              org_id!=10410) || 
414
+              org_id == 10387
411 415
             "
412 416
           >
413 417
             <template slot-scope="scope">
@@ -1098,7 +1102,8 @@
1098 1102
                 template_id == 60 ||
1099 1103
                 org_id== 10432 || 
1100 1104
                 org_id== 10445 ||
1101
-                org_id== 10410)
1105
+                org_id== 10410) &&
1106
+                org_id!=10387
1102 1107
             "
1103 1108
           >
1104 1109
             <el-form-item label="超滤率(ml/h)" :prop="isName('超滤率')"
@@ -1110,7 +1115,7 @@
1110 1115
             :span="8"
1111 1116
             v-if="
1112 1117
               isShow('超滤率') &&
1113
-              template_id != 6 &&
1118
+              (template_id != 6 &&
1114 1119
               template_id != 10 &&
1115 1120
               template_id != 11 &&
1116 1121
               template_id != 12 &&
@@ -1142,7 +1147,8 @@
1142 1147
               template_id != 60 &&
1143 1148
               org_id!=10432 && 
1144 1149
               org_id!=10445 &&
1145
-              org_id!=10410
1150
+              org_id!=10410)
1151
+              || org_id == 10387
1146 1152
             "
1147 1153
           >
1148 1154
             <el-form-item label="超滤率(L/h)" :prop="isName('超滤率')"
@@ -1193,10 +1199,10 @@
1193 1199
                 org_id == 10210 ||
1194 1200
                 org_id == 9555 ||
1195 1201
                 org_id == 10340 ||
1196
-                org_id == 10387 ||
1197 1202
                 org_id == 10432 ||
1198 1203
                 org_id == 10445 ||
1199
-                org_id == 10410)
1204
+                org_id == 10410) 
1205
+                && org_id!=10387
1200 1206
             "
1201 1207
           >
1202 1208
             <el-form-item label="超滤量(ml):" :prop="isName('超滤量')"
@@ -1209,7 +1215,7 @@
1209 1215
             :span="8"
1210 1216
             v-if="
1211 1217
               isShow('超滤量') &&
1212
-              template_id != 6 &&
1218
+              (template_id != 6 &&
1213 1219
               template_id != 9 &&
1214 1220
               template_id != 10 &&
1215 1221
               template_id != 11 &&
@@ -1247,10 +1253,10 @@
1247 1253
               org_id !=  10210 &&
1248 1254
               org_id !=  10340 &&
1249 1255
               org_id != 9555 &&
1250
-              org_id!=10387&&
1251 1256
               org_id!=10432 && 
1252 1257
               org_id!=10445 && 
1253
-              org_id!=10410
1258
+              org_id!=10410)
1259
+              || org_id == 10387
1254 1260
             "
1255 1261
           >
1256 1262
             <el-form-item label="超滤量(L):" :prop="isName('超滤量')"

+ 4 - 4
src/xt_pages/dialysis/details/dialysisMonitoring.vue 查看文件

@@ -14,10 +14,10 @@
14 14
           <th width="76px">静脉压/动脉压({{monitores[0]&&monitores[0]['venous_pressure_type'] == 2 ? 'kpa' : 'mmHg'}})</th>
15 15
           <th v-if="isShow('血流量')" width="92px">血流量(ml/min)</th>
16 16
           <th v-if="isShow('跨膜压')" width="76px">跨膜压({{monitores[0]&&monitores[0]['transmembrane_pressure_type'] == 2 ? 'kpa' : 'mmHg'}})</th>
17
-          <th v-if=" isShow('超滤量') &&(template_id == 6 || template_id == 9 || template_id == 10 || template_id == 11 || template_id == 13 || template_id == 17 || template_id == 18 || template_id == 19 || template_id == 20 || template_id == 21 || template_id == 22 || template_id == 23 || template_id == 24 || template_id == 26 || template_id == 27 || template_id == 28 || template_id == 29 || template_id == 30 || template_id == 31 || template_id == 32 || template_id == 34 || template_id == 35 || template_id == 36 || template_id == 38 || template_id == 39 || template_id == 40  || template_id == 41 || template_id == 43 || template_id == 44 || template_id == 46 || template_id == 47 || template_id == 48 || this.$store.getters.xt_user.template_info.org_id == 9555 || template_id == 53 || template_id == 54 || template_id == 56 || template_id == 60 || this.$store.getters.xt_user.template_info.org_id == 10340  || this.$store.getters.xt_user.template_info.org_id == 10387 || this.$store.getters.xt_user.template_info.org_id == 10432 || this.$store.getters.xt_user.template_info.org_id == 10445 || this.$store.getters.xt_user.template_info.org_id == 10410)" width="76px" > 超滤量(ml)</th>
18
-          <th v-if=" isShow('超滤量') && template_id != 6 && template_id != 9 && template_id != 10 && template_id != 11 && template_id != 13 && template_id != 17 && template_id != 18 && template_id != 19 && template_id != 20 && template_id != 21 && template_id != 22 && template_id != 23 && template_id != 24 && template_id != 26 && template_id !=27 && template_id!=28 && template_id!=29 && template_id!=30 && template_id!=31 && template_id!=32 && template_id!=34 && template_id!=35 && template_id!=36 && template_id!=38 && template_id != 39 && template_id != 40  && template_id != 41 && template_id != 43 && template_id != 44 && template_id != 46  && template_id != 47 && template_id != 48 && template_id != 53  && template_id != 54  && template_id != 56  && template_id != 60 && this.$store.getters.xt_user.template_info.org_id != 9555 &&  this.$store.getters.xt_user.template_info.org_id != 10340 && this.$store.getters.xt_user.template_info.org_id!=10387 && this.$store.getters.xt_user.template_info.org_id!=10432  && this.$store.getters.xt_user.template_info.org_id!=10445 && this.$store.getters.xt_user.template_info.org_id!=10410"  width="76px"> 超滤量(L) </th>
19
-          <th v-if="isShow('超滤率') && (template_id ==6 || template_id == 10 || template_id == 11 || template_id == 12 || template_id == 13 || template_id == 17 || template_id == 18 || template_id == 19 || template_id == 20 || template_id == 21 || template_id == 22 || template_id == 23 || template_id == 24 || template_id == 26 || template_id == 29 || template_id == 30 || template_id == 31 || template_id == 34 || template_id == 35 || template_id == 38 || template_id == 41 || template_id == 43 || template_id == 44 || template_id == 46 || template_id == 47  || template_id == 48  || template_id == 53 || template_id == 54 || template_id == 56  || template_id == 60 || this.$store.getters.xt_user.template_info.org_id == 10432 || this.$store.getters.xt_user.template_info.org_id == 10445 || this.$store.getters.xt_user.template_info.org_id == 10410)" width="50px"> 超滤率 <br />(ml/h) </th>
20
-          <th v-if="isShow('超滤率') && template_id !=6 && template_id !=10 && template_id !=11 && template_id !=12 && template_id !=13 && template_id !=17 && template_id !=18 && template_id !=19 && template_id !=20 && template_id !=21 && template_id !=22 && template_id !=23 && template_id !=24 && template_id !=26 && template_id !=29 && template_id !=30 && template_id !=31 && template_id !=34 && template_id !=35 && template_id !=38  && template_id !=41 && template_id !=43 && template_id !=44 && template_id !=46 && template_id !=47 &&  template_id !=48 &&  template_id !=53 &&  template_id !=54 &&  template_id !=56 &&  template_id !=60 && this.$store.getters.xt_user.template_info.org_id!=10432  && this.$store.getters.xt_user.template_info.org_id!=10445 && this.$store.getters.xt_user.template_info.org_id!=10410" width="50px"> 超滤率 <br />(L/h) </th>
17
+          <th v-if=" isShow('超滤量') &&(template_id == 6 || template_id == 9 || template_id == 10 || template_id == 11 || template_id == 13 || template_id == 17 || template_id == 18 || template_id == 19 || template_id == 20 || template_id == 21 || template_id == 22 || template_id == 23 || template_id == 24 || template_id == 26 || template_id == 27 || template_id == 28 || template_id == 29 || template_id == 30 || template_id == 31 || template_id == 32 || template_id == 34 || template_id == 35 || template_id == 36 || template_id == 38 || template_id == 39 || template_id == 40  || template_id == 41 || template_id == 43 || template_id == 44 || template_id == 46 || template_id == 47 || template_id == 48 || this.$store.getters.xt_user.template_info.org_id == 9555 || template_id == 53 || template_id == 54 || template_id == 56 || template_id == 60 || this.$store.getters.xt_user.template_info.org_id == 10340  || this.$store.getters.xt_user.template_info.org_id == 10432 || this.$store.getters.xt_user.template_info.org_id == 10445 || this.$store.getters.xt_user.template_info.org_id == 10410) &&this.$store.getters.xt_user.template_info.org_id!=10387 " width="76px" > 超滤量(ml)</th>
18
+          <th v-if=" isShow('超滤量') && (template_id != 6 && template_id != 9 && template_id != 10 && template_id != 11 && template_id != 13 && template_id != 17 && template_id != 18 && template_id != 19 && template_id != 20 && template_id != 21 && template_id != 22 && template_id != 23 && template_id != 24 && template_id != 26 && template_id !=27 && template_id!=28 && template_id!=29 && template_id!=30 && template_id!=31 && template_id!=32 && template_id!=34 && template_id!=35 && template_id!=36 && template_id!=38 && template_id != 39 && template_id != 40  && template_id != 41 && template_id != 43 && template_id != 44 && template_id != 46  && template_id != 47 && template_id != 48 && template_id != 53  && template_id != 54  && template_id != 56  && template_id != 60 && this.$store.getters.xt_user.template_info.org_id != 9555 &&  this.$store.getters.xt_user.template_info.org_id != 10340 && this.$store.getters.xt_user.template_info.org_id!=10432  && this.$store.getters.xt_user.template_info.org_id!=10445 && this.$store.getters.xt_user.template_info.org_id!=10410) || this.$store.getters.xt_user.template_info.org_id == 10387"  width="76px"> 超滤量(L) </th>
19
+          <th v-if="isShow('超滤率') && (template_id ==6 || template_id == 10 || template_id == 11 || template_id == 12 || template_id == 13 || template_id == 17 || template_id == 18 || template_id == 19 || template_id == 20 || template_id == 21 || template_id == 22 || template_id == 23 || template_id == 24 || template_id == 26 || template_id == 29 || template_id == 30 || template_id == 31 || template_id == 34 || template_id == 35 || template_id == 38 || template_id == 41 || template_id == 43 || template_id == 44 || template_id == 46 || template_id == 47  || template_id == 48  || template_id == 53 || template_id == 54 || template_id == 56  || template_id == 60 || this.$store.getters.xt_user.template_info.org_id == 10432 || this.$store.getters.xt_user.template_info.org_id == 10445 || this.$store.getters.xt_user.template_info.org_id == 10410) && this.$store.getters.xt_user.template_info.org_id!=10387" width="50px"> 超滤率 <br />(ml/h) </th>
20
+          <th v-if="isShow('超滤率') && (template_id !=6 && template_id !=10 && template_id !=11 && template_id !=12 && template_id !=13 && template_id !=17 && template_id !=18 && template_id !=19 && template_id !=20 && template_id !=21 && template_id !=22 && template_id !=23 && template_id !=24 && template_id !=26 && template_id !=29 && template_id !=30 && template_id !=31 && template_id !=34 && template_id !=35 && template_id !=38  && template_id !=41 && template_id !=43 && template_id !=44 && template_id !=46 && template_id !=47 &&  template_id !=48 &&  template_id !=53 &&  template_id !=54 &&  template_id !=56 &&  template_id !=60 && this.$store.getters.xt_user.template_info.org_id!=10432  && this.$store.getters.xt_user.template_info.org_id!=10445 && this.$store.getters.xt_user.template_info.org_id!=10410) || this.$store.getters.xt_user.template_info.org_id==10387" width="50px"> 超滤率 <br />(L/h) </th>
21 21
           <th v-if="isShow('钠浓度')" width="92px">钠浓度(mmol/L)</th>
22 22
           <th v-if="isShow('透析液温度')" width="92px">透析液温度(℃)</th>
23 23
           <th v-if=" isShow('置换率') && (template_id == 6 || template_id == 10 || template_id == 11 || template_id == 20 || template_id == 26 || template_id == 29 || template_id == 46  || template_id == 48 || template_id == 53  || template_id == 54 || template_id == 56 || org_id == 10432 || org_id == 10445) " width="92px" > 置换率(ml/min) </th>

+ 3 - 3
src/xt_pages/dialysis/template/DialysisPrintOrderFortyThree.vue 查看文件

@@ -814,7 +814,7 @@
814 814
                                   : "mmHg"
815 815
                               }})
816 816
                             </td>
817
-                            <td width="60">透析液温度(°C)</td>
817
+                            <td width="60">动脉压</td>
818 818
                             <!-- <td width="50">电导度<br />(ms/cm)</td> -->
819 819
                             <td width="50">超滤率<br />ml/h</td>
820 820
                             <td width="50">超滤量<br />(ml)</td>
@@ -884,8 +884,8 @@
884 884
                             <!-- 透析液温度 -->
885 885
                             <td>
886 886
                               {{
887
-                                monitor.dialysate_temperature
888
-                                  ? monitor.dialysate_temperature
887
+                                monitor.arterial_pressure
888
+                                  ? monitor.arterial_pressure
889 889
                                   : ""
890 890
                               }}
891 891
                             </td>

+ 59 - 14
src/xt_pages/dialysis/template/DialysisPrintOrderSix.vue 查看文件

@@ -832,6 +832,20 @@
832 832
                         }}
833 833
                       </div>
834 834
                     </div>
835
+
836
+                     <div class="inline_block" style="flex: 1" v-if="org_id ==0 || org_id ==10440">
837
+                      衣物重:
838
+                      <div
839
+                        class="under_line"
840
+                        style="width: 70px; text-align: center"
841
+                      >
842
+                        {{
843
+                          predialysis.additional_weight
844
+                            ? predialysis.additional_weight
845
+                            : "/"
846
+                        }}
847
+                      </div>
848
+                    </div>
835 849
                     <div class="inline_block" style="flex: 1" v-if="org_id==10290">
836 850
                       透析器/灌流器:
837 851
                       <div
@@ -901,7 +915,7 @@
901 915
                     class="row"
902 916
                     style="padding: 2px 0; line-height: 23px; display: flex"
903 917
                   >
904
-                    <div class="inline_block" style="flex: 1">
918
+                    <div class="inline_block" style="flex: 1" v-if="org_id!=0 && org_id!=10440">
905 919
                       上次透后体重:
906 920
                       <div
907 921
                         class="under_line"
@@ -1493,8 +1507,8 @@
1493 1507
                       
1494 1508
 
1495 1509
                         <td>
1496
-                          <span v-if="org_id!=9671 && org_id!=10440 && org_id!=10471"> {{ monitor.ultrafiltration_volume? monitor.ultrafiltration_volume: ""}}</span>
1497
-                          <span v-if="org_id==9671 || org_id==10440 || org_id == 10471"> {{ monitor.ultrafiltration_volume? monitor.ultrafiltration_volume: "0"}}</span>
1510
+                          <span v-if="org_id!=9671 && org_id!=10440"> {{ monitor.ultrafiltration_volume? monitor.ultrafiltration_volume: ""}}</span>
1511
+                          <span v-if="org_id==9671 || org_id==10440"> {{ monitor.ultrafiltration_volume? monitor.ultrafiltration_volume: "0"}}</span>
1498 1512
                         </td>
1499 1513
                         <!-- <td style="width:50px">
1500 1514
                           <span v-if="(prescription.mode_id == 2 || prescription.mode_id == 5 || prescription.mode_id == 12) && ((dialysisOrder && monitor.operate_time <= dialysisOrder.end_time) && (dialysisOrder && monitor.operate_time >= dialysisOrder.start_time))">
@@ -2468,6 +2482,37 @@
2468 2482
                     </div>
2469 2483
                   </div>
2470 2484
 
2485
+
2486
+                   <div
2487
+                    v-if="org_id == 10440 || org_id == 0"
2488
+                    class="row"
2489
+                    style="padding: 2px 0; line-height: 23px; display: flex"
2490
+                  >
2491
+                    <div
2492
+                      class="inline_block"
2493
+                      style="flex: 1; display: inline-block"
2494
+                    >
2495
+                      衣物重:
2496
+                      <div
2497
+                        class="under_line"
2498
+                        style="
2499
+                          width: 100px;
2500
+                          line-height: 25px;
2501
+                          text-align: left;
2502
+                          margin-left: 2px;
2503
+                          display: inline-block;
2504
+                          white-space: normal;
2505
+                        "
2506
+                      >
2507
+                        {{
2508
+                          afterdialysis.additional_weight
2509
+                            ? afterdialysis.additional_weight
2510
+                            : "/"
2511
+                        }}
2512
+                      </div>
2513
+                    </div>
2514
+                  </div>
2515
+
2471 2516
                   <div
2472 2517
                     class="row"
2473 2518
                     style="padding: 2px 0; line-height: 23px; display: flex"
@@ -2596,7 +2641,7 @@
2596 2641
                           }}</span
2597 2642
                         >
2598 2643
                         <img
2599
-                          style="height: 30px"
2644
+                          style="height: 40px"
2600 2645
                           :src="
2601 2646
                             setAdminUserES(
2602 2647
                               dialysisOrder == null
@@ -2639,7 +2684,7 @@
2639 2684
                           }}</span
2640 2685
                         >
2641 2686
                         <img
2642
-                          style="height: 30px"
2687
+                          style="height: 40px"
2643 2688
                           :src="
2644 2689
                             setAdminUserES(
2645 2690
                               dialysisOrder == null
@@ -2667,7 +2712,7 @@
2667 2712
                       >
2668 2713
                     
2669 2714
                         <span
2670
-                          style="height: 30px; display: inline-block"
2715
+                          style="height: 40px; display: inline-block"
2671 2716
                           v-if="
2672 2717
                             setAdminUserES(
2673 2718
                               dialysisOrder == null
@@ -2685,7 +2730,7 @@
2685 2730
                           }}</span
2686 2731
                         >
2687 2732
                         <img
2688
-                          style="height: 30px"
2733
+                          style="height: 40px"
2689 2734
                           :src="
2690 2735
                             setAdminUserES(
2691 2736
                               dialysisOrder == null
@@ -2732,7 +2777,7 @@
2732 2777
                           }}</span
2733 2778
                         >
2734 2779
                         <img
2735
-                          style="height: 30px"
2780
+                          style="height: 40px"
2736 2781
                           :src="
2737 2782
                             setAdminUserES(
2738 2783
                               dialysisOrder == null
@@ -2768,7 +2813,7 @@
2768 2813
                           {{ getAdminUser(check == null ? 0 : check.creater) }}
2769 2814
                         </span>
2770 2815
                         <img
2771
-                          style="height: 30px"
2816
+                          style="height: 40px"
2772 2817
                           :src="
2773 2818
                             setAdminUserES(check == null ? 0 : check.creater)
2774 2819
                           "
@@ -2795,7 +2840,7 @@
2795 2840
                           {{ getAdminUser(check == null ? 0 : check.creater) }}
2796 2841
                         </span>
2797 2842
                         <img
2798
-                          style="height: 30px"
2843
+                          style="height: 40px"
2799 2844
                           :src="
2800 2845
                             setAdminUserES(check == null ? 0 : check.creater)
2801 2846
                           "
@@ -2823,7 +2868,7 @@
2823 2868
                           {{ getAdminUser(check == null ? 0 : check.modifier) }}
2824 2869
                         </span>
2825 2870
                         <img
2826
-                          style="height: 30px"
2871
+                          style="height: 40px"
2827 2872
                           :src="
2828 2873
                             setAdminUserES(check == null ? 0 : check.modifier)
2829 2874
                           "
@@ -2851,7 +2896,7 @@
2851 2896
                           {{ getAdminUser(check == null ? 0 : check.creater) }}
2852 2897
                         </span>
2853 2898
                         <img
2854
-                          style="height: 30px"
2899
+                          style="height: 40px"
2855 2900
                           :src="
2856 2901
                             setAdminUserES(check == null ? 0 : check.creater)
2857 2902
                           "
@@ -2886,7 +2931,7 @@
2886 2931
                           }}
2887 2932
                         </span>
2888 2933
                         <img
2889
-                          style="height: 30px"
2934
+                          style="height: 40px"
2890 2935
                           :src="
2891 2936
                             setAdminUserES(
2892 2937
                               dialysisOrder == null
@@ -2913,7 +2958,7 @@
2913 2958
                           {{ getAdminUser(prescription.creater) }}
2914 2959
                         </span>
2915 2960
                         <img
2916
-                          style="height: 30px"
2961
+                          style="height: 40px"
2917 2962
                           :src="setAdminUserES(prescription.creater)"
2918 2963
                           alt=""
2919 2964
                           srcset=""

+ 1 - 1
src/xt_pages/management/components/RepairForm.vue 查看文件

@@ -345,7 +345,7 @@
345 345
       ></el-pagination>
346 346
     </el-row>
347 347
 
348
-    <!-- 编辑维修记录 -->
348
+    <-- 编辑维修记录 -->
349 349
     <el-dialog
350 350
       title="编辑维修记录"
351 351
       :visible.sync="dialogVisible"

+ 1 - 2
src/xt_pages/management/components/UserForm.vue 查看文件

@@ -1557,8 +1557,6 @@ export default {
1557 1557
       });
1558 1558
     },
1559 1559
     EditUser(id, patientid) {
1560
-       console.log("hh2h333232332233232323322323",id)
1561
-       console.log("patient_id2323223323223322332323322323",patientid)
1562 1560
       EditUser(id, patientid).then(response => {
1563 1561
         if (response.data.state === 1) {
1564 1562
           this.dialogVisible = true;
@@ -2509,6 +2507,7 @@ export default {
2509 2507
           }else{
2510 2508
             this.form.bed = ""
2511 2509
             this.bedNumberTwo = []
2510
+            this.getAllSubregion()
2512 2511
 
2513 2512
           }
2514 2513
 

+ 187 - 56
src/xt_pages/management/components/WaterForm.vue 查看文件

@@ -37,7 +37,7 @@
37 37
          <el-row>
38 38
             <el-col :span="8">
39 39
                 <el-form-item label="原水电导度(μs/cm):" prop="water_conductivity"  class="st" label-width="100px">
40
-                    <el-input  v-model="form.water_conductivity" style="width:100px" 
40
+                    <el-input  v-model="form.water_conductivity" style="width:100px"
41 41
                         oninput="value=value.replace(/[^\d.]/g, '').replace(/\.{2,}/g, '.').replace('.', '$#$').replace(/\./g, '').replace('$#$', '.').replace(/^(\-)*(\d+)\.(\d\d).*$/, '$1$2.$3').replace(/^\./g, '')"
42 42
                     >
43 43
                     </el-input>
@@ -48,7 +48,7 @@
48 48
             </el-col>
49 49
             <el-col :span="8">
50 50
                 <el-form-item label="原水压力(Mpa):"  class="st">
51
-                    <el-input  v-model="form.water_pressure" style="width:100px" 
51
+                    <el-input  v-model="form.water_pressure" style="width:100px"
52 52
                     oninput="value=value.replace(/[^\d.]/g, '').replace(/\.{2,}/g, '.').replace('.', '$#$').replace(/\./g, '').replace('$#$', '.').replace(/^(\-)*(\d+)\.(\d\d).*$/, '$1$2.$3').replace(/^\./g, '')"
53 53
                     >
54 54
                     </el-input>
@@ -174,7 +174,7 @@
174 174
                     <el-input  v-model="form.total_chlorine_detection" style="width:100px"
175 175
                     oninput="value=value.replace(/[^\d.]/g, '').replace(/\.{2,}/g, '.').replace('.', '$#$').replace(/\./g, '').replace('$#$', '.').replace(/^(\-)*(\d+)\.(\d\d).*$/, '$1$2.$3').replace(/^\./g, '')"
176 176
                      ></el-input>
177
-                     
177
+
178 178
                 </el-form-item>
179 179
             </el-col>
180 180
             <el-col :span="8">
@@ -237,16 +237,16 @@
237 237
             </el-col>
238 238
             <el-col :span="8">
239 239
                 <el-form-item label="时长(h):"  class="st">
240
-                    <el-input  v-model="form.last_disinfection_time"  style="width:100px" oninput="value=value.replace(/[^\d^\.]/g, '')"></el-input>
240
+                    <el-input  v-model="form.last_disinfection_time" style="width:100px" oninput="value=value.replace(/[^\d^\.]/g, '')"></el-input>
241 241
                 </el-form-item>
242 242
             </el-col>
243 243
          </el-row>
244 244
 
245 245
          <el-row>
246
-          
246
+
247 247
             <el-col :span="8">
248 248
                 <el-form-item label="过滤器更换(只):"  class="st">
249
-                    <el-input  v-model="form.filter_replacement" style="width:100px" 
249
+                    <el-input  v-model="form.filter_replacement" style="width:100px"
250 250
                     oninput="value=value.replace(/[^\d.]/g, '').replace(/\.{2,}/g, '.').replace('.', '$#$').replace(/\./g, '').replace('$#$', '.').replace(/^(\-)*(\d+)\.(\d\d).*$/, '$1$2.$3').replace(/^\./g, '')"
251 251
                     ></el-input>
252 252
                 </el-form-item>
@@ -273,15 +273,15 @@
273 273
               </el-form-item>
274 274
           </el-col>
275 275
 
276
-        
276
+
277 277
         </el-row>
278
-       
278
+
279 279
         </el-form>
280 280
         <div style="float:right">
281 281
             <el-button type="primary" @click="saveWater('form')">保存</el-button>
282 282
         </div>
283 283
 
284
-      
284
+
285 285
     </div>
286 286
 </template>
287 287
 <script>
@@ -314,7 +314,7 @@ import {getAllDoctorList,saveWaterList} from "@/api/manage";
314 314
               last_ro_membrane_effluent:"",
315 315
               last_production_of_water_conductivity:"",//产水电导度
316 316
               last_water_yield:"",//产水量
317
-             
317
+
318 318
               carbon_tank:"",//碳罐
319 319
               snd_tank:"",//砂罐,
320 320
               resin_tank:"",//树脂罐
@@ -332,12 +332,12 @@ import {getAllDoctorList,saveWaterList} from "@/api/manage";
332 332
               remark:"",//备注
333 333
               filter_replacement:"",//过滤器更换
334 334
               admin_user_id:"",//记录人
335
-              
335
+
336 336
             },
337 337
             machineType:[
338
-               {id:0,name:"全部"}, 
339
-               {id:1,name:"正常"}, 
340
-               {id:2,name:"故障"}, 
338
+               {id:0,name:"全部"},
339
+               {id:1,name:"正常"},
340
+               {id:2,name:"故障"},
341 341
             ],
342 342
             forcePumpList:[
343 343
               {id:0,name:"全部"},
@@ -347,7 +347,7 @@ import {getAllDoctorList,saveWaterList} from "@/api/manage";
347 347
             disinfectionType:[
348 348
             { id: 0, name: "请选择" },
349 349
             { id: 1, name: "热消毒" },
350
-            { id: 2, name: "化学消毒" }   
350
+            { id: 2, name: "化学消毒" }
351 351
             ],
352 352
             checked:"",
353 353
             rules: {
@@ -355,7 +355,7 @@ import {getAllDoctorList,saveWaterList} from "@/api/manage";
355 355
            },
356 356
            nurseList:[],
357 357
         }
358
-       
358
+
359 359
     },
360 360
     methods:{
361 361
         saveWater(formName){
@@ -366,8 +366,8 @@ import {getAllDoctorList,saveWaterList} from "@/api/manage";
366 366
         if(this.form.machine_status!=""){
367 367
           this.form.machine_status = parseInt(this.form.machine_status)
368 368
         }
369
-      
370
-       
369
+
370
+
371 371
         if(this.form.reverse_osmosis_membrane_disinfection == true){
372 372
            this.form.reverse_osmosis_membrane_disinfection = 1
373 373
         }
@@ -383,9 +383,9 @@ import {getAllDoctorList,saveWaterList} from "@/api/manage";
383 383
         if(this.form.water_conductivity!=""){
384 384
           this.form.water_conductivity = parseFloat(this.form.water_conductivity)== NaN ? 0:parseFloat(this.form.water_conductivity)
385 385
         }else{
386
-           this.form.water_conductivity = 0 
386
+           this.form.water_conductivity = 0
387 387
         }
388
-        
388
+
389 389
         if(this.form.water_pressure!=""){
390 390
           this.form.water_pressure = parseFloat(this.form.water_pressure) == NaN ? 0:parseFloat(this.form.water_pressure)
391 391
         }else{
@@ -395,15 +395,15 @@ import {getAllDoctorList,saveWaterList} from "@/api/manage";
395 395
         if(this.form.temperature!=""){
396 396
           this.form.temperature = parseFloat(this.form.temperature)== NaN ? 0:parseFloat(this.form.temperature)
397 397
         }else{
398
-          this.form.temperature = 0    
398
+          this.form.temperature = 0
399 399
         }
400
-        
400
+
401 401
         if(this.form.force_pump_status!=""){
402 402
           this.form.force_pump_status = parseFloat(this.form.force_pump_status) ==  NaN ? 0: parseFloat(this.form.force_pump_status)
403 403
         }else{
404 404
             this.form.force_pump_status = 0
405 405
         }
406
-        
406
+
407 407
         if(this.form.first_ro_membrane_water!=""){
408 408
           this.form.first_ro_membrane_water = parseFloat(this.form.first_ro_membrane_water) == NaN?0:parseFloat(this.form.first_ro_membrane_water)
409 409
         }else{
@@ -415,11 +415,11 @@ import {getAllDoctorList,saveWaterList} from "@/api/manage";
415 415
         }else{
416 416
           this.form.first_ro_film_thick_water = 0
417 417
         }
418
-        
418
+
419 419
         if(this.form.first_ro_membrane_effluent!=""){
420
-          this.form.first_ro_membrane_effluent =parseFloat(this.form.first_ro_membrane_effluent) == NaN?0:parseFloat(this.form.first_ro_membrane_effluent) 
420
+          this.form.first_ro_membrane_effluent =parseFloat(this.form.first_ro_membrane_effluent) == NaN?0:parseFloat(this.form.first_ro_membrane_effluent)
421 421
         }else{
422
-           this.form.first_ro_membrane_effluent = 0 
422
+           this.form.first_ro_membrane_effluent = 0
423 423
         }
424 424
 
425 425
         if(this.form.first_production_of_water_conductivity!=""){
@@ -427,37 +427,37 @@ import {getAllDoctorList,saveWaterList} from "@/api/manage";
427 427
         }else{
428 428
           this.form.first_production_of_water_conductivity = 0
429 429
         }
430
-        
430
+
431 431
         if(this.form.first_water_yield !=""){
432
-           this.form.first_water_yield = parseFloat(this.form.first_water_yield) == NaN?0:parseFloat(this.form.first_water_yield)  
432
+           this.form.first_water_yield = parseFloat(this.form.first_water_yield) == NaN?0:parseFloat(this.form.first_water_yield)
433 433
         }else{
434 434
             this.form.first_water_yield =0
435 435
         }
436
-       
436
+
437 437
         if(this.form.last_ro_membrane_water!=""){
438
-          this.form.last_ro_membrane_water = parseFloat(this.form.last_ro_membrane_water) ==NaN?0:parseFloat(this.form.last_ro_membrane_water)  
438
+          this.form.last_ro_membrane_water = parseFloat(this.form.last_ro_membrane_water) ==NaN?0:parseFloat(this.form.last_ro_membrane_water)
439 439
         }else{
440 440
           this.form.last_ro_membrane_water = 0
441 441
         }
442
-      
442
+
443 443
         if(this.form.last_ro_membrane_effluent!=""){
444 444
           this.form.last_ro_membrane_effluent = parseFloat(this.form.last_ro_membrane_effluent) == NaN?0:parseFloat(this.form.last_ro_membrane_effluent)
445 445
         }else{
446 446
           this.form.last_ro_membrane_effluent = 0
447 447
         }
448
-      
448
+
449 449
         if(this.form.last_ro_film_thick_water!=""){
450 450
             this.form.last_ro_film_thick_water = parseFloat(this.form.last_ro_film_thick_water) == NaN?0:parseFloat(this.form.last_ro_film_thick_water)
451 451
         }else{
452 452
           this.form.last_ro_film_thick_water = 0
453 453
         }
454
-   
454
+
455 455
         if( this.form.last_production_of_water_conductivity!=""){
456 456
             this.form.last_production_of_water_conductivity = parseFloat(this.form.last_production_of_water_conductivity) == NaN?0:parseFloat(this.form.last_production_of_water_conductivity)
457 457
         }else{
458 458
             this.form.last_production_of_water_conductivity =0
459 459
         }
460
-       
460
+
461 461
         if(this.form.last_water_yield!=""){
462 462
             this.form.last_water_yield = parseFloat(this.form.last_water_yield)==NaN?0: parseFloat(this.form.last_water_yield)
463 463
         }else{
@@ -469,25 +469,25 @@ import {getAllDoctorList,saveWaterList} from "@/api/manage";
469 469
         }else{
470 470
             this.form.carbon_tank = 0
471 471
         }
472
-        
472
+
473 473
         if( this.form.snd_tank!=""){
474 474
             this.form.snd_tank = parseFloat(this.form.snd_tank) == NaN?0:parseFloat(this.form.snd_tank)
475 475
         }else{
476 476
             this.form.snd_tank = 0
477 477
         }
478
-         
478
+
479 479
         if(this.form.resin_tank!=""){
480 480
             this.form.resin_tank= parseFloat(this.form.resin_tank) ==NaN?0:parseFloat(this.form.resin_tank)
481 481
         }else{
482 482
             this.form.resin_tank= 0
483 483
         }
484
-      
484
+
485 485
         if( this.form.ultrafilter!=""){
486 486
             this.form.ultrafilter = parseFloat(this.form.ultrafilter)== NaN?0:parseFloat(this.form.ultrafilter)
487 487
         }else{
488 488
           this.form.ultrafilter = 0
489 489
         }
490
-        
490
+
491 491
         if(this.form.hardness_monitoring !=""){
492 492
             this.form.hardness_monitoring = parseFloat(this.form.hardness_monitoring) ==NaN?0: parseFloat(this.form.hardness_monitoring)
493 493
         }else{
@@ -499,7 +499,7 @@ import {getAllDoctorList,saveWaterList} from "@/api/manage";
499 499
         }else{
500 500
             this.form.total_chlorine_detection = 0
501 501
         }
502
-        
502
+
503 503
         if( this.form.ph_detection!=""){
504 504
             this.form.ph_detection = parseFloat(this.form.ph_detection) == NaN?0:parseFloat(this.form.ph_detection)
505 505
         }else{
@@ -507,7 +507,7 @@ import {getAllDoctorList,saveWaterList} from "@/api/manage";
507 507
         }
508 508
 
509 509
         if(this.form.concentration_of_peroxyacetic_acid!="" ){
510
-            this.form.concentration_of_peroxyacetic_acid = parseFloat(this.form.concentration_of_peroxyacetic_acid) == NaN?0: parseFloat(this.form.concentration_of_peroxyacetic_acid)   
510
+            this.form.concentration_of_peroxyacetic_acid = parseFloat(this.form.concentration_of_peroxyacetic_acid) == NaN?0: parseFloat(this.form.concentration_of_peroxyacetic_acid)
511 511
         }else{
512 512
             this.form.concentration_of_peroxyacetic_acid = 0
513 513
         }
@@ -523,26 +523,26 @@ import {getAllDoctorList,saveWaterList} from "@/api/manage";
523 523
         }else{
524 524
             this.form.first_disinfection_method = 0
525 525
         }
526
-      
527
-       
526
+
527
+
528 528
         if(this.form.last_disinfection_method !=""){
529 529
            this.form.last_disinfection_method = parseFloat(this.form.last_disinfection_method) == NaN?0:parseFloat(this.form.last_disinfection_method)
530 530
         }else{
531 531
             this.form.last_disinfection_method = 0
532 532
         }
533
-       
533
+
534 534
         if(this.form.first_disinfection_time !=""){
535 535
           this.form.first_disinfection_time = parseFloat(this.form.first_disinfection_time) == NaN?0:parseFloat(this.form.first_disinfection_time)
536 536
         }else{
537 537
             this.form.first_disinfection_time = 0
538 538
         }
539
-        
539
+
540 540
         if( this.form.last_disinfection_time!=""){
541 541
             this.form.last_disinfection_time = parseFloat(this.form.last_disinfection_time) == NaN?0:parseFloat(this.form.last_disinfection_time)
542 542
         }else{
543
-            this.form.last_disinfection_time = 0  
543
+            this.form.last_disinfection_time = 0
544 544
         }
545
-      
545
+
546 546
         if(this.form.filter_replacement!=""){
547 547
             this.form.filter_replacement = parseFloat(this.form.filter_replacement) == NaN?0:parseFloat(this.form.filter_replacement)
548 548
         }else{
@@ -554,14 +554,14 @@ import {getAllDoctorList,saveWaterList} from "@/api/manage";
554 554
         }else{
555 555
             this.form.admin_user_id =0
556 556
         }
557
-        
557
+
558 558
         if(this.form.disinfection_of_water_pipeline !=""){
559 559
             this.form.disinfection_of_water_pipeline = parseFloat(this.form.disinfection_of_water_pipeline) == NaN?0:parseFloat(this.form.disinfection_of_water_pipeline)
560 560
         }else{
561 561
             this.form.disinfection_of_water_pipeline =0
562 562
         }
563
-      
564
-       
563
+
564
+
565 565
         console.log("233223232323",this.form)
566 566
          this.$refs[formName].validate((valid) => {
567 567
           if (valid) {
@@ -570,7 +570,135 @@ import {getAllDoctorList,saveWaterList} from "@/api/manage";
570 570
                 var deviceWater =  response.data.data.deviceWater
571 571
                 console.log("保存成功!",deviceWater)
572 572
                 this.$message.success("保存成功!")
573
+                console.log("2333333333333333333333333w",this.form.water_conductivity)
574
+                if(this.form.water_conductivity == 0){
575
+                   this.form.water_conductivity = ""
576
+                }
577
+                if(this.form.fault_description == 0){
578
+                   this.form.fault_description = ""
579
+                }
580
+
581
+                if(this.form.water_conductivity == 0){
582
+                   this.form.water_conductivity = ""
583
+                }
573 584
 
585
+                if(this.form.water_pressure == 0){
586
+                  this.form.water_pressure = ""
587
+                }
588
+
589
+                if(this.form.temperature == 0){
590
+                   this.form.temperature = ""
591
+                }
592
+
593
+                if(this.form.first_ro_membrane_water == 0){
594
+                   this.form.first_ro_membrane_water = ""
595
+                }
596
+
597
+                if(this.form.first_ro_film_thick_water ==0 ){
598
+                   this.form.first_ro_film_thick_water = ""
599
+                }
600
+
601
+                if(this.form.first_ro_membrane_effluent == 0){
602
+                   this.form.first_ro_membrane_effluent=""
603
+                }
604
+
605
+                if(this.form.first_production_of_water_conductivity == 0){
606
+                   this.form.first_production_of_water_conductivity = ""
607
+                }
608
+
609
+                if(this.form.first_water_yield == 0){
610
+                   this.form.first_water_yield = ""
611
+                }
612
+
613
+                if(this.form.last_ro_membrane_water == 0){
614
+                  this.form.last_ro_membrane_water= ""
615
+                }
616
+
617
+                if(this.form.last_ro_film_thick_water== 0){
618
+                   this.form.last_ro_film_thick_water = ""
619
+                }
620
+
621
+                if(this.form.last_ro_membrane_effluent == 0){
622
+                  this.form.last_ro_membrane_effluent = ""
623
+                }
624
+
625
+                if(this.form.last_production_of_water_conductivity == 0){
626
+                  this.form.last_production_of_water_conductivity = ""
627
+                }
628
+
629
+                if(this.form.last_water_yield  == 0){
630
+                  this.form.last_water_yield = ""
631
+                }
632
+
633
+                if(this.form.carbon_tank == 0){
634
+                   this.form.carbon_tank = ""
635
+                }
636
+
637
+                if(this.form.snd_tank == 0){
638
+                  this.form.snd_tank = ""
639
+                }
640
+
641
+                if(this.form.resin_tank == 0){
642
+                  this.form.resin_tank= ""
643
+                }
644
+
645
+                if(this.form.ultrafilter == 0){
646
+                   this.form.ultrafilter= ""
647
+                }
648
+
649
+                if(this.form.hardness_monitoring  ==0){
650
+                    this.form.hardness_monitoring = ""
651
+                }
652
+
653
+                if(this.form.total_chlorine_detection == 0){
654
+                  this.form.total_chlorine_detection= ""
655
+                }
656
+                if(this.form.concentration_of_peroxyacetic_acid == 0){
657
+                  this.form.concentration_of_peroxyacetic_acid = ""
658
+                }
659
+
660
+                if(this.form.reverse_osmosis_membrane_disinfection ==0){
661
+                  this.form.reverse_osmosis_membrane_disinfection = ""
662
+                }
663
+
664
+                if(this.form.disinfection_of_water_pipeline == 0){
665
+                  this.form.disinfection_of_water_pipeline= ""
666
+                }
667
+
668
+                if(this.form.first_disinfection_method == 0){
669
+                    this.form.first_disinfection_method = ""
670
+                }
671
+
672
+                if(this.form.last_disinfection_method  == 0){
673
+                    this.form.last_disinfection_method = ""
674
+                }
675
+
676
+                if(this.form.first_disinfection_time == 0){
677
+                  this.form.first_disinfection_time = ""
678
+                }
679
+
680
+                if(this.form.last_disinfection_time == 0){
681
+                  this.form.last_disinfection_time = ""
682
+                }
683
+
684
+                if(this.form.remark == 0){
685
+                  this.form.remark = ""
686
+                }
687
+
688
+                if(this.form.filter_replacement == 0){
689
+                    this.form.filter_replacement = ""
690
+                }
691
+
692
+                if(this.form.admin_user_id == 0){
693
+                   this.form.admin_user_id = ""
694
+                }
695
+
696
+
697
+
698
+
699
+                // this.$parent.toParent()
700
+
701
+             }else{
574 702
                 this.form.fault_description = ""
575 703
                 this.form.water_conductivity = ""
576 704
                 this.form.water_pressure = ""
@@ -612,11 +740,12 @@ import {getAllDoctorList,saveWaterList} from "@/api/manage";
612 740
              var doctorList = response.data.data.list
613 741
              console.log("dcotorlist",doctorList)
614 742
              for(let i=0;i<doctorList.length;i++){
615
-              if(doctorList[i].user_type == 3){
616
-                 this.nurseList.push(doctorList[i])
617
-              }
743
+            //   if(doctorList[i].user_type == 3){
744
+            //      this.nurseList.push(doctorList[i])
745
+            //   }
746
+               this.nurseList.push(doctorList[i])
618 747
              }
619
-
748
+             console.log("nurseLisrt===============",this.nurseList)
620 749
            }
621 750
          })
622 751
        },
@@ -642,13 +771,15 @@ import {getAllDoctorList,saveWaterList} from "@/api/manage";
642 771
     //     }
643 772
     },
644 773
     created(){
774
+       this.form.admin_user_id = this.$store.getters.xt_user.user.id
775
+    //    this.form.admin_user_id = 829
645 776
        this.getAllDoctorList()
646 777
     },
647 778
     mounted(){
648
-        
779
+
649 780
     }
650 781
  }
651
- 
782
+
652 783
 </script>
653 784
 <style scoped>
654 785
 .el-row {
@@ -657,4 +788,4 @@ import {getAllDoctorList,saveWaterList} from "@/api/manage";
657 788
 .newMain .el-form-item__label {
658 789
     width: 110px !important;
659 790
 }
660
-</style>
791
+</style>

+ 11 - 0
src/xt_pages/management/components/WaterFormList.vue 查看文件

@@ -5,6 +5,7 @@
5 5
           <span class="machineClass">日期查询:</span>
6 6
           <el-date-picker
7 7
             v-model="form.start_time"
8
+            @change="changeStartime"
8 9
             prefix-icon="none"
9 10
             type="date"
10 11
             placeholder="请选择"
@@ -14,6 +15,7 @@
14 15
           ></el-date-picker
15 16
           >-
16 17
           <el-date-picker
18
+           @change="changeEndtime"
17 19
             v-model="form.end_time"
18 20
             prefix-icon="none"
19 21
             type="date"
@@ -879,6 +881,14 @@
879 881
         }
880 882
       },
881 883
       methods:{
884
+        changeStartime(){
885
+         this.tableData = []
886
+         this.getlist()
887
+        },
888
+        changeEndtime(){
889
+         this.tableData = []
890
+         this.getlist()
891
+        },
882 892
          getlist(){
883 893
            var params = {
884 894
              start_time:this.form.start_time,
@@ -1328,6 +1338,7 @@
1328 1338
         },
1329 1339
       },
1330 1340
       created(){
1341
+        console.log("list+++++++++++++++++++++++")
1331 1342
         this.getlist()
1332 1343
       }
1333 1344
     }

+ 12 - 4
src/xt_pages/management/home.vue 查看文件

@@ -1368,8 +1368,8 @@
1368 1368
                           </el-tab-pane>
1369 1369
 
1370 1370
                            <el-tab-pane label="使用登记列表" name="second" >
1371
-                             <user-form ref="userForm" :userdata="userdata" v-if="device_type == 1"></user-form>
1372
-                             <water-form-list ref="waterFormList" v-if="device_type == 2" :equimentid="equimentid"></water-form-list>
1371
+                             <user-form ref="childFive" :userdata="userdata" v-if="device_type == 1"></user-form>
1372
+                             <water-form-list ref="childSix" v-if="device_type == 2" :equimentid="equimentid"></water-form-list>
1373 1373
                            </el-tab-pane>
1374 1374
                        </el-tabs>
1375 1375
                      </div>
@@ -3383,7 +3383,7 @@ export default {
3383 3383
         this.getAllMachine()
3384 3384
       },
3385 3385
       changeDeviceId(val) {
3386
-        console.log("val-------",val)
3386
+       
3387 3387
         if (val === 1) {
3388 3388
           this.zoneDisabled = false
3389 3389
         } else {
@@ -3428,7 +3428,7 @@ export default {
3428 3428
         this.tabIndex = index
3429 3429
       },
3430 3430
       handleCurrentChange(val) {
3431
-      
3431
+        console.log("val3223323223",val)
3432 3432
         // 通过设备型号区分质量控制
3433 3433
         this.device_type = val.device_type
3434 3434
         this.unitType = val.unit_type
@@ -3446,6 +3446,14 @@ export default {
3446 3446
         this.GetUserTotalCount(val.bed_id)
3447 3447
         this.getTimeBeteen(val.id)
3448 3448
         this.getData(val.bed_id)
3449
+        if(val.device_type == 2){
3450
+          this.$refs.childSix.getlist()
3451
+        }
3452
+       
3453
+      },
3454
+      toParent(){
3455
+        console.log("处方23322332")
3456
+        this.$refs.childSix.getlist()
3449 3457
       },
3450 3458
       getAutoData(id) {
3451 3459
         getAutoData(id).then(response => {

+ 1 - 1
src/xt_pages/user/firstDiseasePrint.vue 查看文件

@@ -71,7 +71,7 @@
71 71
                   {{getDoctor(hosDetail==null?0:(hosDetail.doctor?hosDetail.doctor:hosDetail.doctor))}}
72 72
                   </span>
73 73
                   <span v-else>
74
-                    <img style="height:30px;" :src="setAdminUserES(hosDetail==null?0:(hosDetail.doctor?hosDetail.doctor:hosDetail.doctor))" alt="" srcset="">
74
+                    <img style="height:50px;" :src="setAdminUserES(hosDetail==null?0:(hosDetail.doctor?hosDetail.doctor:hosDetail.doctor))" alt="" srcset="">
75 75
                   </span>
76 76
               </div>
77 77
           </div>

+ 1 - 1
src/xt_pages/user/hospitalSummaryPrint.vue 查看文件

@@ -273,7 +273,7 @@
273 273
                   {{getDoctor(hosDetail.doctor)}} 
274 274
              </span>
275 275
               <span v-else>
276
-                <img style="height:30px;" :src="setAdminUserES(hosDetail.doctor?hosDetail.doctor:hosDetail.doctor)" alt="" srcset="">
276
+                <img style="height:50px;" :src="setAdminUserES(hosDetail.doctor?hosDetail.doctor:hosDetail.doctor)" alt="" srcset="">
277 277
               </span>
278 278
               </span>
279 279
             </td>

+ 13 - 13
src/xt_permission.js 查看文件

@@ -12,19 +12,19 @@ const permissionWhiteList = loginWhiteList.concat(['/']) // 权限验证白名
12 12
 
13 13
 router.beforeEach((to, from, next) => {
14 14
   // 线上注释
15
-  if (!store.getters.configlist || store.getters.configlist === undefined || store.getters.configlist.length <= 0) {
16
-    store.dispatch('VerifyConfigList', []).then(() => {
17
-      next()
18
-    })
19
-  }
20
-  if (store.getters.permission_routers === undefined) {
21
-    store.dispatch('xt_GenerateRoutes', []).then(() => {
22
-      next()
23
-    })
24
-  } else {
25
-    next()
26
-  }
27
-  return
15
+  // if (!store.getters.configlist || store.getters.configlist === undefined || store.getters.configlist.length <= 0) {
16
+  //   store.dispatch('VerifyConfigList', []).then(() => {
17
+  //     next()
18
+  //   })
19
+  // }
20
+  // if (store.getters.permission_routers === undefined) {
21
+  //   store.dispatch('xt_GenerateRoutes', []).then(() => {
22
+  //     next()
23
+  //   })
24
+  // } else {
25
+  //   next()
26
+  // }
27
+  // return
28 28
   // 线上注释
29 29
   NProgress.start()
30 30
   // console.log(store.getters.current_role_urls.indexOf(to.path))