XMLWAN 2 vuotta sitten
vanhempi
commit
d749679164

+ 2 - 2
src/xt_pages/dialysis/details/DialysisPrescription.vue Näytä tiedosto

111
           <label>目标超滤量 : </label>
111
           <label>目标超滤量 : </label>
112
           <span class="content">{{ target_ultrafiltration != "0" ? target_ultrafiltration : ""}}</span>
112
           <span class="content">{{ target_ultrafiltration != "0" ? target_ultrafiltration : ""}}</span>
113
           
113
           
114
-          <span v-if="this.$store.getters.xt_user.template_info.template_id != 17 && this.$store.getters.xt_user.template_info.template_id != 9 && this.$store.getters.xt_user.template_info.template_id != 20 && this.$store.getters.xt_user.template_info.template_id != 21 && this.$store.getters.xt_user.template_info.template_id != 22 && this.$store.getters.xt_user.template_info.template_id != 23 && this.$store.getters.xt_user.template_info.template_id != 24 && this.$store.getters.xt_user.template_info.template_id != 26 && this.$store.getters.xt_user.template_info.template_id != 28 && this.$store.getters.xt_user.template_info.template_id != 27 && this.$store.getters.xt_user.template_info.template_id != 29 && this.$store.getters.xt_user.template_info.template_id != 30 && this.$store.getters.xt_user.template_info.template_id != 31 && this.$store.getters.xt_user.template_info.template_id != 32 && this.$store.getters.xt_user.template_info.template_id != 34 && this.$store.getters.xt_user.template_info.template_id != 38 && this.$store.getters.xt_user.template_info.template_id != 40 && this.$store.getters.xt_user.template_info.template_id != 43 && this.$store.getters.xt_user.template_info.template_id != 45  && this.$store.getters.xt_user.template_info.template_id != 46  && this.$store.getters.xt_user.template_info.template_id != 48 && this.$store.getters.xt_user.template_info.org_id != 9555  && this.$store.getters.xt_user.template_info.org_id != 10345"  class="unit">{{ target_ultrafiltration != "0" ? "L" : "" }}</span>
115
-          <span v-if="this.$store.getters.xt_user.template_info.template_id == 17 || this.$store.getters.xt_user.template_info.template_id == 9 || this.$store.getters.xt_user.template_info.template_id == 20 || this.$store.getters.xt_user.template_info.template_id == 21 || this.$store.getters.xt_user.template_info.template_id == 22 || this.$store.getters.xt_user.template_info.template_id == 23 || this.$store.getters.xt_user.template_info.template_id == 24 || this.$store.getters.xt_user.template_info.template_id == 26 || this.$store.getters.xt_user.template_info.template_id == 28 || this.$store.getters.xt_user.template_info.template_id == 27 || this.$store.getters.xt_user.template_info.template_id == 29 || this.$store.getters.xt_user.template_info.template_id == 30 || this.$store.getters.xt_user.template_info.template_id == 31 || this.$store.getters.xt_user.template_info.template_id == 32 || this.$store.getters.xt_user.template_info.template_id == 34 || this.$store.getters.xt_user.template_info.template_id == 38 || this.$store.getters.xt_user.template_info.template_id == 40 || this.$store.getters.xt_user.template_info.template_id == 43 || this.$store.getters.xt_user.template_info.template_id == 45 || this.$store.getters.xt_user.template_info.template_id == 46  || this.$store.getters.xt_user.template_info.template_id == 48 || this.$store.getters.xt_user.template_info.org_id == 9555 || this.$store.getters.xt_user.template_info.org_id == 10345" class="unit">{{ target_ultrafiltration != "0" ? "ml" : "" }}</span>
114
+          <span v-if="this.$store.getters.xt_user.template_info.template_id != 17 && this.$store.getters.xt_user.template_info.template_id != 9 && this.$store.getters.xt_user.template_info.template_id != 20 && this.$store.getters.xt_user.template_info.template_id != 21 && this.$store.getters.xt_user.template_info.template_id != 22 && this.$store.getters.xt_user.template_info.template_id != 23 && this.$store.getters.xt_user.template_info.template_id != 24 && this.$store.getters.xt_user.template_info.template_id != 26 && this.$store.getters.xt_user.template_info.template_id != 28 && this.$store.getters.xt_user.template_info.template_id != 27 && this.$store.getters.xt_user.template_info.template_id != 29 && this.$store.getters.xt_user.template_info.template_id != 30 && this.$store.getters.xt_user.template_info.template_id != 31 && this.$store.getters.xt_user.template_info.template_id != 32 && this.$store.getters.xt_user.template_info.template_id != 34 && this.$store.getters.xt_user.template_info.template_id != 38 && this.$store.getters.xt_user.template_info.template_id != 40 && this.$store.getters.xt_user.template_info.template_id != 43 && this.$store.getters.xt_user.template_info.template_id != 45  && this.$store.getters.xt_user.template_info.template_id != 46  && this.$store.getters.xt_user.template_info.template_id != 48 && this.$store.getters.xt_user.template_info.org_id != 9555  && this.$store.getters.xt_user.template_info.org_id != 10345  && this.$store.getters.xt_user.template_info.org_id != 10346"  class="unit">{{ target_ultrafiltration != "0" ? "L" : "" }}</span>
115
+          <span v-if="this.$store.getters.xt_user.template_info.template_id == 17 || this.$store.getters.xt_user.template_info.template_id == 9 || this.$store.getters.xt_user.template_info.template_id == 20 || this.$store.getters.xt_user.template_info.template_id == 21 || this.$store.getters.xt_user.template_info.template_id == 22 || this.$store.getters.xt_user.template_info.template_id == 23 || this.$store.getters.xt_user.template_info.template_id == 24 || this.$store.getters.xt_user.template_info.template_id == 26 || this.$store.getters.xt_user.template_info.template_id == 28 || this.$store.getters.xt_user.template_info.template_id == 27 || this.$store.getters.xt_user.template_info.template_id == 29 || this.$store.getters.xt_user.template_info.template_id == 30 || this.$store.getters.xt_user.template_info.template_id == 31 || this.$store.getters.xt_user.template_info.template_id == 32 || this.$store.getters.xt_user.template_info.template_id == 34 || this.$store.getters.xt_user.template_info.template_id == 38 || this.$store.getters.xt_user.template_info.template_id == 40 || this.$store.getters.xt_user.template_info.template_id == 43 || this.$store.getters.xt_user.template_info.template_id == 45 || this.$store.getters.xt_user.template_info.template_id == 46  || this.$store.getters.xt_user.template_info.template_id == 48 || this.$store.getters.xt_user.template_info.org_id == 9555 || this.$store.getters.xt_user.template_info.org_id == 10345  || this.$store.getters.xt_user.template_info.org_id == 10346" class="unit">{{ target_ultrafiltration != "0" ? "ml" : "" }}</span>
116
         </li>
116
         </li>
117
 
117
 
118
          <li v-if="isShow('目标超滤量') && this.$store.getters.xt_user.template_info.org_id == 10290">
118
          <li v-if="isShow('目标超滤量') && this.$store.getters.xt_user.template_info.org_id == 10290">

+ 2 - 2
src/xt_pages/dialysis/details/dialog/dialysisPrescriptionDialog.vue Näytä tiedosto

87
                     </el-col>
87
                     </el-col>
88
 
88
 
89
                     <el-col :span="8"
89
                     <el-col :span="8"
90
-                            v-if="isShows('目标超滤量') && (this.$store.getters.xt_user.template_info.template_id == 17 || this.$store.getters.xt_user.template_info.template_id == 9 || this.$store.getters.xt_user.template_info.template_id == 20 || this.$store.getters.xt_user.template_info.template_id == 21 || this.$store.getters.xt_user.template_info.template_id == 22  || this.$store.getters.xt_user.template_info.template_id == 23 || this.$store.getters.xt_user.template_info.template_id == 24 || this.$store.getters.xt_user.template_info.template_id == 26 || this.$store.getters.xt_user.template_info.template_id == 28  || this.$store.getters.xt_user.template_info.template_id == 27 || this.$store.getters.xt_user.template_info.template_id == 29 || this.$store.getters.xt_user.template_info.template_id == 30 || this.$store.getters.xt_user.template_info.template_id == 31 || this.$store.getters.xt_user.template_info.template_id == 32 || this.$store.getters.xt_user.template_info.template_id == 34 || this.$store.getters.xt_user.template_info.template_id == 38 ||  this.$store.getters.xt_user.template_info.template_id == 40 ||  this.$store.getters.xt_user.template_info.template_id == 43 ||  this.$store.getters.xt_user.template_info.template_id == 45  ||  this.$store.getters.xt_user.template_info.template_id == 46 ||  this.$store.getters.xt_user.template_info.template_id == 48 || this.$store.getters.xt_user.template_info.org_id == 9555 || this.$store.getters.xt_user.template_info.org_id == 10345)">
90
+                            v-if="isShows('目标超滤量') && (this.$store.getters.xt_user.template_info.template_id == 17 || this.$store.getters.xt_user.template_info.template_id == 9 || this.$store.getters.xt_user.template_info.template_id == 20 || this.$store.getters.xt_user.template_info.template_id == 21 || this.$store.getters.xt_user.template_info.template_id == 22  || this.$store.getters.xt_user.template_info.template_id == 23 || this.$store.getters.xt_user.template_info.template_id == 24 || this.$store.getters.xt_user.template_info.template_id == 26 || this.$store.getters.xt_user.template_info.template_id == 28  || this.$store.getters.xt_user.template_info.template_id == 27 || this.$store.getters.xt_user.template_info.template_id == 29 || this.$store.getters.xt_user.template_info.template_id == 30 || this.$store.getters.xt_user.template_info.template_id == 31 || this.$store.getters.xt_user.template_info.template_id == 32 || this.$store.getters.xt_user.template_info.template_id == 34 || this.$store.getters.xt_user.template_info.template_id == 38 ||  this.$store.getters.xt_user.template_info.template_id == 40 ||  this.$store.getters.xt_user.template_info.template_id == 43 ||  this.$store.getters.xt_user.template_info.template_id == 45  ||  this.$store.getters.xt_user.template_info.template_id == 46 ||  this.$store.getters.xt_user.template_info.template_id == 48 || this.$store.getters.xt_user.template_info.org_id == 9555 || this.$store.getters.xt_user.template_info.org_id == 10345 || this.$store.getters.xt_user.template_info.org_id == 10346)">
91
                         <el-form-item label="目标超滤量(ml):">
91
                         <el-form-item label="目标超滤量(ml):">
92
                             <el-input
92
                             <el-input
93
                                     type="number"
93
                                     type="number"
98
 
98
 
99
 
99
 
100
                     <el-col :span="8"
100
                     <el-col :span="8"
101
-                            v-if="isShows('目标超滤量')  && this.$store.getters.xt_user.template_info.template_id != 17 && this.$store.getters.xt_user.template_info.template_id != 9 && this.$store.getters.xt_user.template_info.template_id != 20 && this.$store.getters.xt_user.template_info.template_id != 21 && this.$store.getters.xt_user.template_info.template_id != 22 && this.$store.getters.xt_user.template_info.template_id != 23 && this.$store.getters.xt_user.template_info.template_id != 24 && this.$store.getters.xt_user.template_info.template_id != 26 && this.$store.getters.xt_user.template_info.template_id != 28 && this.$store.getters.xt_user.template_info.template_id != 27 && this.$store.getters.xt_user.template_info.template_id != 29 && this.$store.getters.xt_user.template_info.template_id != 30 && this.$store.getters.xt_user.template_info.template_id != 31 && this.$store.getters.xt_user.template_info.template_id != 32 && this.$store.getters.xt_user.template_info.template_id != 34 && this.$store.getters.xt_user.template_info.template_id != 38 &&  this.$store.getters.xt_user.template_info.template_id != 40 &&  this.$store.getters.xt_user.template_info.template_id != 43 &&  this.$store.getters.xt_user.template_info.template_id != 45 &&  this.$store.getters.xt_user.template_info.template_id != 46  &&  this.$store.getters.xt_user.template_info.template_id != 48 && this.$store.getters.xt_user.template_info.org_id != 9555 &&  this.$store.getters.xt_user.template_info.org_id != 10345 ">
101
+                            v-if="isShows('目标超滤量')  && this.$store.getters.xt_user.template_info.template_id != 17 && this.$store.getters.xt_user.template_info.template_id != 9 && this.$store.getters.xt_user.template_info.template_id != 20 && this.$store.getters.xt_user.template_info.template_id != 21 && this.$store.getters.xt_user.template_info.template_id != 22 && this.$store.getters.xt_user.template_info.template_id != 23 && this.$store.getters.xt_user.template_info.template_id != 24 && this.$store.getters.xt_user.template_info.template_id != 26 && this.$store.getters.xt_user.template_info.template_id != 28 && this.$store.getters.xt_user.template_info.template_id != 27 && this.$store.getters.xt_user.template_info.template_id != 29 && this.$store.getters.xt_user.template_info.template_id != 30 && this.$store.getters.xt_user.template_info.template_id != 31 && this.$store.getters.xt_user.template_info.template_id != 32 && this.$store.getters.xt_user.template_info.template_id != 34 && this.$store.getters.xt_user.template_info.template_id != 38 &&  this.$store.getters.xt_user.template_info.template_id != 40 &&  this.$store.getters.xt_user.template_info.template_id != 43 &&  this.$store.getters.xt_user.template_info.template_id != 45 &&  this.$store.getters.xt_user.template_info.template_id != 46  &&  this.$store.getters.xt_user.template_info.template_id != 48 && this.$store.getters.xt_user.template_info.org_id != 9555 &&  this.$store.getters.xt_user.template_info.org_id != 10345 &&  this.$store.getters.xt_user.template_info.org_id != 10346">
102
                         <el-form-item label="目标超滤量(L):">
102
                         <el-form-item label="目标超滤量(L):">
103
                             <el-input
103
                             <el-input
104
                                     type="number"
104
                                     type="number"

+ 18 - 3
src/xt_pages/dialysis/details/dialog/monitor_dialog.vue Näytä tiedosto

231
                 template_id == 47 ||
231
                 template_id == 47 ||
232
                 template_id == 48 ||
232
                 template_id == 48 ||
233
                 template_id == 51 ||
233
                 template_id == 51 ||
234
+                template_id == 53 ||
234
                 org_id == 10210 ||
235
                 org_id == 10210 ||
235
                 org_id == 9555)
236
                 org_id == 9555)
236
             "
237
             "
282
               template_id != 46 &&
283
               template_id != 46 &&
283
               template_id != 47 &&
284
               template_id != 47 &&
284
               template_id != 48 &&
285
               template_id != 48 &&
285
-               template_id != 51 &&
286
+              template_id != 51 &&
287
+              template_id != 53 &&
286
               org_id!= 10210 &&
288
               org_id!= 10210 &&
287
               org_id != 9555
289
               org_id != 9555
288
             "
290
             "
328
                 template_id == 44 ||
330
                 template_id == 44 ||
329
                 template_id == 46 ||
331
                 template_id == 46 ||
330
                 template_id == 48 ||
332
                 template_id == 48 ||
333
+                template_id == 53 ||
331
                 template_id == 47)
334
                 template_id == 47)
332
             "
335
             "
333
           >
336
           >
370
               template_id != 43 &&
373
               template_id != 43 &&
371
               template_id != 44 &&
374
               template_id != 44 &&
372
               template_id != 46 &&
375
               template_id != 46 &&
376
+              template_id != 53 &&
373
               template_id != 48 &&
377
               template_id != 48 &&
374
               template_id != 47
378
               template_id != 47
375
             "
379
             "
426
                 template_id == 26 ||
430
                 template_id == 26 ||
427
                 template_id == 29 ||
431
                 template_id == 29 ||
428
                 template_id == 48 ||
432
                 template_id == 48 ||
433
+                template_id == 53 ||
429
                 template_id == 47)
434
                 template_id == 47)
430
             "
435
             "
431
           >
436
           >
448
               template_id != 26 &&
453
               template_id != 26 &&
449
               template_id != 29 &&
454
               template_id != 29 &&
450
               template_id != 48 &&
455
               template_id != 48 &&
456
+              template_id != 53 &&
451
               template_id != 47
457
               template_id != 47
452
             "
458
             "
453
           >
459
           >
487
                 template_id == 20 ||
493
                 template_id == 20 ||
488
                 template_id == 26 ||
494
                 template_id == 26 ||
489
                 template_id == 29 ||
495
                 template_id == 29 ||
496
+                template_id == 53 ||
490
                 template_id == 48)
497
                 template_id == 48)
491
             "
498
             "
492
           >
499
           >
513
               template_id != 26 &&
520
               template_id != 26 &&
514
               template_id != 29 &&
521
               template_id != 29 &&
515
               template_id != 43 &&
522
               template_id != 43 &&
523
+              template_id != 53 &&
516
               template_id != 48
524
               template_id != 48
517
             "
525
             "
518
           >
526
           >
986
                 template_id == 44 ||
994
                 template_id == 44 ||
987
                 template_id == 46 ||
995
                 template_id == 46 ||
988
                 template_id == 48 ||
996
                 template_id == 48 ||
997
+                template_id == 53 ||
989
                 template_id == 47)
998
                 template_id == 47)
990
             "
999
             "
991
           >
1000
           >
1022
               template_id != 44 &&
1031
               template_id != 44 &&
1023
               template_id != 46 &&
1032
               template_id != 46 &&
1024
               template_id != 48 &&
1033
               template_id != 48 &&
1034
+              template_id != 53 &&
1025
               template_id != 47
1035
               template_id != 47
1026
             "
1036
             "
1027
           >
1037
           >
1065
                 template_id == 47 ||
1075
                 template_id == 47 ||
1066
                 template_id == 48 ||
1076
                 template_id == 48 ||
1067
                 template_id == 51 ||
1077
                 template_id == 51 ||
1078
+                template_id == 53 ||
1068
                 org_id == 10210 ||
1079
                 org_id == 10210 ||
1069
                 org_id == 9555)
1080
                 org_id == 9555)
1070
             "
1081
             "
1109
               template_id != 47 &&
1120
               template_id != 47 &&
1110
               template_id != 51 &&
1121
               template_id != 51 &&
1111
               template_id == 48 &&
1122
               template_id == 48 &&
1112
-             
1123
+              template_id == 53 &&
1113
               org_id !=  10210 &&
1124
               org_id !=  10210 &&
1114
               org_id != 9555
1125
               org_id != 9555
1115
             "
1126
             "
1144
               template_id != 29 &&
1155
               template_id != 29 &&
1145
               template_id != 46 &&
1156
               template_id != 46 &&
1146
               template_id != 47 &&
1157
               template_id != 47 &&
1147
-              template_id != 48 
1158
+              template_id != 48 &&
1159
+              template_id != 53
1148
             "
1160
             "
1149
           >
1161
           >
1150
             <el-form-item label="置换率(L/h):">
1162
             <el-form-item label="置换率(L/h):">
1163
                 template_id == 29 ||
1175
                 template_id == 29 ||
1164
                 template_id == 46 ||
1176
                 template_id == 46 ||
1165
                 template_id == 47 ||
1177
                 template_id == 47 ||
1178
+                template_id == 53 ||
1166
                 template_id == 48)
1179
                 template_id == 48)
1167
             "
1180
             "
1168
           >
1181
           >
1187
               template_id != 29 &&
1200
               template_id != 29 &&
1188
               template_id != 43 &&
1201
               template_id != 43 &&
1189
               template_id != 46 &&
1202
               template_id != 46 &&
1203
+              template_id != 53 &&
1190
               template_id != 48
1204
               template_id != 48
1191
             "
1205
             "
1192
           >
1206
           >
1208
                 template_id == 26 ||
1222
                 template_id == 26 ||
1209
                 template_id == 29 ||
1223
                 template_id == 29 ||
1210
                 template_id == 46 ||
1224
                 template_id == 46 ||
1225
+                template_id == 53 ||
1211
                 template_id == 48)
1226
                 template_id == 48)
1212
             "
1227
             "
1213
           >
1228
           >

+ 8 - 8
src/xt_pages/dialysis/details/dialysisMonitoring.vue Näytä tiedosto

14
           <th width="76px">静脉压/动脉压({{monitores[0]&&monitores[0]['venous_pressure_type'] == 2 ? 'kpa' : 'mmHg'}})</th>
14
           <th width="76px">静脉压/动脉压({{monitores[0]&&monitores[0]['venous_pressure_type'] == 2 ? 'kpa' : 'mmHg'}})</th>
15
           <th v-if="isShow('血流量')" width="92px">血流量(ml/min)</th>
15
           <th v-if="isShow('血流量')" width="92px">血流量(ml/min)</th>
16
           <th v-if="isShow('跨膜压')" width="76px">跨膜压({{monitores[0]&&monitores[0]['transmembrane_pressure_type'] == 2 ? 'kpa' : 'mmHg'}})</th>
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)" 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 && this.$store.getters.xt_user.template_info.org_id != 9555"  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)" 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" 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)" 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 && this.$store.getters.xt_user.template_info.org_id != 9555"  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)" 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" width="50px"> 超滤率 <br />(L/h) </th>
21
           <th v-if="isShow('钠浓度')" width="92px">钠浓度(mmol/L)</th>
21
           <th v-if="isShow('钠浓度')" width="92px">钠浓度(mmol/L)</th>
22
           <th v-if="isShow('透析液温度')" width="92px">透析液温度(℃)</th>
22
           <th v-if="isShow('透析液温度')" width="92px">透析液温度(℃)</th>
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 == 47 || template_id == 48) " width="92px" > 置换率(ml/min) </th>
24
-          <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 != 47 && template_id != 48" width="92px" > 置换率(L/h)  </th>
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 == 47 || template_id == 48 || template_id == 53) " width="92px" > 置换率(ml/min) </th>
24
+          <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 != 47 && template_id != 48 && template_id != 53" width="92px" > 置换率(L/h)  </th>
25
           <th v-if=" isShow('置换量') && (template_id == 43)" width="92px"> 置换量(ml/h)  </th>
25
           <th v-if=" isShow('置换量') && (template_id == 43)" width="92px"> 置换量(ml/h)  </th>
26
-          <th v-if=" isShow('置换量') && ((template_id == 6 && org_id != 9919 && org_id !=10191) || org_id == 9779 || template_id == 11 || template_id == 20 || template_id == 26 || template_id == 29 || template_id == 46 || template_id == 48)" width="92px"  > 置换量(ml)  </th>
27
-          <th v-if=" isShow('置换量') && ((template_id != 6 || org_id == 9919 || org_id == 10191) && org_id != 9779 && template_id != 11 && template_id != 20 && template_id != 26 && template_id != 29 && template_id != 46 && template_id != 48)" width="92px" > 置换量(L) </th>
26
+          <th v-if=" isShow('置换量') && ((template_id == 6 && org_id != 9919 && org_id !=10191) || org_id == 9779 || template_id == 11 || template_id == 20 || template_id == 26 || template_id == 29 || template_id == 46 || template_id == 48 || template_id == 53)" width="92px"  > 置换量(ml)  </th>
27
+          <th v-if=" isShow('置换量') && ((template_id != 6 || org_id == 9919 || org_id == 10191) && org_id != 9779 && template_id != 11 && template_id != 20 && template_id != 26 && template_id != 29 && template_id != 46 && template_id != 48 && template_id != 53)" width="92px" > 置换量(L) </th>
28
           <th v-if=" isShow('SpO₂') && template_id != 6 && template_id != 10 && template_id != 11  " width="92px" > SpO₂(%) </th>
28
           <th v-if=" isShow('SpO₂') && template_id != 6 && template_id != 10 && template_id != 11  " width="92px" > SpO₂(%) </th>
29
           <th v-if="isShow('电导度')" width="92px">电导度(mS/m)</th>
29
           <th v-if="isShow('电导度')" width="92px">电导度(mS/m)</th>
30
           <th v-if="isShow('置换液流量') && template_id != 27" width="92px">置换液流量(ml/h)</th>
30
           <th v-if="isShow('置换液流量') && template_id != 27" width="92px">置换液流量(ml/h)</th>

+ 17 - 6
src/xt_pages/stock/drugs/drugStockInOrderAdd.vue Näytä tiedosto

195
                     filterable
195
                     filterable
196
                     placeholder="请选择单位"
196
                     placeholder="请选择单位"
197
                     style="width: 80px"
197
                     style="width: 80px"
198
-                    @change="changeUnit(scope.row)"
198
+                    @change="changeUnit(scope.row,scope.$index)"
199
                   >
199
                   >
200
                     <el-option
200
                     <el-option
201
                       v-for="(option, index) in unitList"
201
                       v-for="(option, index) in unitList"
252
 
252
 
253
           <el-table-column label="总价(元)" align="center" width="80">
253
           <el-table-column label="总价(元)" align="center" width="80">
254
             <template slot-scope="scope">
254
             <template slot-scope="scope">
255
-              {{
256
-                calculate(scope.row.last_price * scope.row.warehousing_count)
257
-              }}
255
+              {{ calculate(scope.row.last_price * scope.row.warehousing_count) }}
258
             </template>
256
             </template>
259
           </el-table-column>
257
           </el-table-column>
260
 
258
 
684
       tempObj["dealer"] = "";
682
       tempObj["dealer"] = "";
685
       tempObj["last_price"] = "";
683
       tempObj["last_price"] = "";
686
       tempObj["count_unit"] = "";
684
       tempObj["count_unit"] = "";
685
+      tempObj["min_number"] = "";
687
       this.recordInfo.recordData.push(tempObj);
686
       this.recordInfo.recordData.push(tempObj);
688
     },
687
     },
689
     handleDelete: function (index, row) {
688
     handleDelete: function (index, row) {
964
           this.recordInfo.recordData[i].max_unit = val.max_unit;
963
           this.recordInfo.recordData[i].max_unit = val.max_unit;
965
           this.recordInfo.recordData[i].min_unit = val.min_unit;
964
           this.recordInfo.recordData[i].min_unit = val.min_unit;
966
           this.recordInfo.recordData[i].count_unit = val.max_unit;
965
           this.recordInfo.recordData[i].count_unit = val.max_unit;
966
+          this.recordInfo.recordData[i].min_number = val.min_number
967
           if (val.dealer == 0) {
967
           if (val.dealer == 0) {
968
             this.recordInfo.recordData[i].dealer = "";
968
             this.recordInfo.recordData[i].dealer = "";
969
           } else {
969
           } else {
972
         }
972
         }
973
       }
973
       }
974
     },
974
     },
975
-    changeUnit(val){
976
-     console.log("val3232323232",val)
975
+    changeUnit(val,index){
976
+    // console.log("val3232323232",val)
977
+    //  for(let i=0;i<this.recordInfo.recordData.length;i++){
978
+    //    if(i == index){
979
+    //      if(this.recordInfo.recordData[i].max_unit == this.recordInfo.recordData[i].count_unit){
980
+           
981
+    //      }
982
+    //      if(this.recordInfo.recordData[i].min_unit == this.recordInfo.recordData[i].count_unit){
983
+
984
+    //      }
985
+    //    }
986
+    //  }
977
     }
987
     }
978
   },
988
   },
979
   created() {
989
   created() {
1017
     tempObj["dealer"] = "";
1027
     tempObj["dealer"] = "";
1018
     tempObj["number"] = "";
1028
     tempObj["number"] = "";
1019
     tempObj["count_unit"] = "";
1029
     tempObj["count_unit"] = "";
1030
+    tempObj["min_number"] = "";
1020
     this.recordInfo.recordData.push(tempObj);
1031
     this.recordInfo.recordData.push(tempObj);
1021
 
1032
 
1022
     this.GetConfigInfo();
1033
     this.GetConfigInfo();

+ 19 - 40
src/xt_pages/stock/drugs/drugStockOutOrderAdd.vue Näytä tiedosto

570
       tempObj["total_count"] = 0;
570
       tempObj["total_count"] = 0;
571
       tempObj["max_unit_fisrt"] = 0;
571
       tempObj["max_unit_fisrt"] = 0;
572
       tempObj["min_unit_fisrt"] = 0;
572
       tempObj["min_unit_fisrt"] = 0;
573
+      tempObj["total_price"] = 0;
573
       this.recordInfo.recordData.push(tempObj);
574
       this.recordInfo.recordData.push(tempObj);
574
     },
575
     },
575
     handleDelete: function (index, row) {
576
     handleDelete: function (index, row) {
664
             return;
665
             return;
665
           }
666
           }
666
           for (let i = 0; i < this.recordInfo.recordData.length; i++) {
667
           for (let i = 0; i < this.recordInfo.recordData.length; i++) {
667
-            this.recordInfo.recordData[i].price =
668
-              this.recordInfo.recordData[i].price.toString();
668
+            this.recordInfo.recordData[i].total_price = (this.recordInfo.recordData[i].count * this.recordInfo.recordData[i].price).toString()
669
+            this.recordInfo.recordData[i].price = this.recordInfo.recordData[i].price.toString();
669
 
670
 
670
             for (let j = 0; j < this.manufacturerList.length; j++) {
671
             for (let j = 0; j < this.manufacturerList.length; j++) {
671
-              if (
672
-                this.recordInfo.recordData[i].manufacturer ==
673
-                this.manufacturerList[j].manufacturer_name
674
-              ) {
675
-                this.recordInfo.recordData[i].manufacturer =
676
-                  this.manufacturerList[j].id;
672
+              if (this.recordInfo.recordData[i].manufacturer ==  this.manufacturerList[j].manufacturer_name) {
673
+                this.recordInfo.recordData[i].manufacturer = this.manufacturerList[j].id;
677
               }
674
               }
678
             }
675
             }
679
             if (this.recordInfo.recordData[i].dealer == "") {
676
             if (this.recordInfo.recordData[i].dealer == "") {
680
-              this.recordInfo.recordData[i].dealer = 0;
677
+                this.recordInfo.recordData[i].dealer = 0;
681
             }
678
             }
682
             for (let z = 0; z < this.dealerList.length; z++) {
679
             for (let z = 0; z < this.dealerList.length; z++) {
683
-              if (
684
-                this.recordInfo.recordData[i].dealer ==
685
-                this.dealerList[z].dealer_name
686
-              ) {
680
+              if (this.recordInfo.recordData[i].dealer ==this.dealerList[z].dealer_name) {
687
                 this.recordInfo.recordData[i].dealer = this.dealerList[z].id;
681
                 this.recordInfo.recordData[i].dealer = this.dealerList[z].id;
688
               }
682
               }
689
             }
683
             }
690
 
684
 
691
             for (let y = 0; y < this.numberList.length; y++) {
685
             for (let y = 0; y < this.numberList.length; y++) {
692
-              if (
693
-                this.recordInfo.recordData[i].batch_number ==
694
-                this.numberList[y].id
695
-              ) {
696
-                this.recordInfo.recordData[i].batch_number =
697
-                  this.numberList[y].batch_number;
698
-                this.recordInfo.recordData[i].warehouse_info_id =
699
-                  this.numberList[y].id;
686
+              if (this.recordInfo.recordData[i].batch_number ==this.numberList[y].id) {
687
+                this.recordInfo.recordData[i].batch_number = this.numberList[y].batch_number;
688
+                this.recordInfo.recordData[i].warehouse_info_id = this.numberList[y].id;
700
               }
689
               }
701
             }
690
             }
702
             for (let s = 0; s < this.doctorList.length; s++) {
691
             for (let s = 0; s < this.doctorList.length; s++) {
703
-              if (
704
-                this.recordInfo.recordData[i].admin_user_id ==
705
-                this.doctorList[s].user_name
706
-              ) {
707
-                this.recordInfo.recordData[i].admin_user_id =
708
-                  this.doctorList[s].admin_user_id;
692
+              if (this.recordInfo.recordData[i].admin_user_id == this.doctorList[s].user_name) {
693
+                 this.recordInfo.recordData[i].admin_user_id = this.doctorList[s].admin_user_id;
709
               }
694
               }
710
             }
695
             }
711
 
696
 
712
-            this.recordInfo.recordData[i].last_price =
713
-              this.recordInfo.recordData[i].last_price.toString();
714
-            this.recordInfo.recordData[i].stock_count =
715
-              this.recordInfo.recordData[i].stock_count.toString();
697
+            this.recordInfo.recordData[i].last_price = this.recordInfo.recordData[i].last_price.toString();
698
+            this.recordInfo.recordData[i].stock_count = this.recordInfo.recordData[i].stock_count.toString();
716
           }
699
           }
717
           const params = {
700
           const params = {
718
             stockOut: this.recordInfo.recordData,
701
             stockOut: this.recordInfo.recordData,
719
           };
702
           };
720
-
703
+          console.log("param22222222",params)
721
           const loading = this.$loading({
704
           const loading = this.$loading({
722
             lock: true,
705
             lock: true,
723
             text: "Loading",
706
             text: "Loading",
917
     },
900
     },
918
     changeUnit(val, index) {
901
     changeUnit(val, index) {
919
       console.log("vla33232233232323232", val);
902
       console.log("vla33232233232323232", val);
920
-
921
       this.getDrugBatchNumber(val.drug_id);
903
       this.getDrugBatchNumber(val.drug_id);
922
       for (let i = 0; i < this.recordInfo.recordData.length; i++) {
904
       for (let i = 0; i < this.recordInfo.recordData.length; i++) {
923
         if (this.recordInfo.recordData[i].drug_id == val.drug_id) {
905
         if (this.recordInfo.recordData[i].drug_id == val.drug_id) {
926
             this.recordInfo.recordData[i].price = val.retail_price;
908
             this.recordInfo.recordData[i].price = val.retail_price;
927
           }
909
           }
928
           if (this.recordInfo.recordData[i].max_unit == val.min_unit) {
910
           if (this.recordInfo.recordData[i].max_unit == val.min_unit) {
929
-            this.recordInfo.recordData[i].price =
930
-              this.recordInfo.recordData[i].min_price;
911
+            this.recordInfo.recordData[i].price = this.recordInfo.recordData[i].min_price;
931
           }
912
           }
932
         }
913
         }
933
         for (let j = 0; j < this.numberList.length; j++) {
914
         for (let j = 0; j < this.numberList.length; j++) {
934
-          if (
935
-            this.recordInfo.recordData[i].batch_number == this.numberList[j].id
936
-          ) {
937
-            this.recordInfo.recordData[i].batch_number =
938
-              this.numberList[j].batch_number;
915
+          if (this.recordInfo.recordData[i].batch_number == this.numberList[j].id) {
916
+            this.recordInfo.recordData[i].batch_number = this.numberList[j].batch_number;
939
           }
917
           }
940
         }
918
         }
941
       }
919
       }
1094
     tempObj["total_count"] = 0;
1072
     tempObj["total_count"] = 0;
1095
     tempObj["max_unit_fisrt"] = 0;
1073
     tempObj["max_unit_fisrt"] = 0;
1096
     tempObj["min_unit_fisrt"] = 0;
1074
     tempObj["min_unit_fisrt"] = 0;
1075
+    tempObj["total_price"] = 0;
1097
     this.recordInfo.recordData.push(tempObj);
1076
     this.recordInfo.recordData.push(tempObj);
1098
     this.GetConfigInfo();
1077
     this.GetConfigInfo();
1099
     this.propForm.goodUnit = this.$store.getters.good_unit;
1078
     this.propForm.goodUnit = this.$store.getters.good_unit;

+ 6 - 4
src/xt_pages/stock/drugs/drugStockOutOrderDetailPrint.vue Näytä tiedosto

7
     </div>
7
     </div>
8
     <div class="app-container ">
8
     <div class="app-container ">
9
       <div id="dialysis-print-box">
9
       <div id="dialysis-print-box">
10
-        <div v-if="orgId!=9671 && orgId!=10210">
10
+        <div v-if="orgId!=9675 && orgId!=10210">
11
         <div class="dialysis-print-order" v-for="(it,index) in tableList" :key="index">
11
         <div class="dialysis-print-order" v-for="(it,index) in tableList" :key="index">
12
          <div class="order-yy-name" style="font-size:22px;font-weight:bold;letter-spacing:0px;margin-top:40px">{{orgName}}</div>
12
          <div class="order-yy-name" style="font-size:22px;font-weight:bold;letter-spacing:0px;margin-top:40px">{{orgName}}</div>
13
           <div class="order-title" style="font-weight:500;font-size:18px;">药品出库登记表</div>
13
           <div class="order-title" style="font-weight:500;font-size:18px;">药品出库登记表</div>
78
       </div> 
78
       </div> 
79
 
79
 
80
 
80
 
81
-      <div v-if="orgId == 9671 || orgId == 10210">
81
+      <div v-if="orgId == 9675 || orgId == 10210">
82
        <div class="dialysis-print-order" v-for="(it,index) in tableData" :key="index" >
82
        <div class="dialysis-print-order" v-for="(it,index) in tableData" :key="index" >
83
          <div class="order-yy-name" style="font-size:22px;font-weight:bold;letter-spacing:0px;margin-top:40px">{{orgName}}</div>
83
          <div class="order-yy-name" style="font-size:22px;font-weight:bold;letter-spacing:0px;margin-top:40px">{{orgName}}</div>
84
           <div class="order-title" style="font-weight:500;font-size:18px;">药品出库登记表</div>
84
           <div class="order-title" style="font-weight:500;font-size:18px;">药品出库登记表</div>
127
              <td>{{(getTime(item.product_date))}}</td>
127
              <td>{{(getTime(item.product_date))}}</td>
128
              <td>{{(getTime(item.expire_date))}}</td>
128
              <td>{{(getTime(item.expire_date))}}</td>
129
             </tr>
129
             </tr>
130
+
130
              <tr>
131
              <tr>
131
                <td style="line-height:50px">合计</td>
132
                <td style="line-height:50px">合计</td>
132
                <td colspan="7"></td>
133
                <td colspan="7"></td>
133
-               <td>{{getTotalPrince(it.xt_drug_warehouse_out_info).toFixed(2)}}</td>
134
+               <td>{{getTotalPrice(it.xt_drug_warehouse_out_info)}}</td>
134
              </tr>
135
              </tr>
135
             </tbody>
136
             </tbody>
136
           </table>
137
           </table>
405
             var manufacturerList = response.data.data.manufacturerList
406
             var manufacturerList = response.data.data.manufacturerList
406
            
407
            
407
             this.manufactureList = manufacturerList
408
             this.manufactureList = manufacturerList
408
-            console.log("nfo32323223323223232323",info)
409
+            
409
             this.tableList = info
410
             this.tableList = info
410
             this.tableData = response.data.data.drug_warhouse_out
411
             this.tableData = response.data.data.drug_warhouse_out
412
+            console.log("nfo32323223323223232323",this.tableData)
411
             this.loading = false
413
             this.loading = false
412
           }
414
           }
413
         })
415
         })

+ 3 - 3
src/xt_pages/stock/stockPrint.vue Näytä tiedosto

49
                                    <td v-if="end_time == ''">
49
                                    <td v-if="end_time == ''">
50
                                       <span v-if="org_id == 9671 || org_id == 10138 || org_id == 10028 || org_id == 9675 || org_id == 4 || org_id == 3877 || org_id == 10243 || org_id == 10088 || org_id== 10245 || org_id == 9779 || org_id == 10290 || org_id == 10265 || org_id == 10210">
50
                                       <span v-if="org_id == 9671 || org_id == 10138 || org_id == 10028 || org_id == 9675 || org_id == 4 || org_id == 3877 || org_id == 10243 || org_id == 10088 || org_id== 10245 || org_id == 9779 || org_id == 10290 || org_id == 10265 || org_id == 10210">
51
                                         <span>
51
                                         <span>
52
-                                          {{getWareInfo(item.xt_warehouse_info) - getOverFlushInfo(item.xt_warehouse_info) + getCancelSotckInfo(item.cancel_stock_info)}}
52
+                                          {{getWareInfo(item.xt_warehouse_info) - getOverFlushInfo(item.xt_warehouse_info)}}
53
                                         </span>
53
                                         </span>
54
                                       </span>
54
                                       </span>
55
                                       <span v-else>{{getAutoCount(item.id) + getOutCount(item.id)}} </span>
55
                                       <span v-else>{{getAutoCount(item.id) + getOutCount(item.id)}} </span>
64
                                         {{getOverFlushInfo(item.xt_warehouse_info)}}
64
                                         {{getOverFlushInfo(item.xt_warehouse_info)}}
65
                                      </span>
65
                                      </span>
66
                                      <span v-else>
66
                                      <span v-else>
67
-                                       {{getWareInfo(item.xt_warehouse_info) - getAutoCount(item.id) - getOutCount(item.id) + getCancelCount(item.id) }}
67
+                                       {{getWareInfo(item.xt_warehouse_info) - getAutoCount(item.id) - getOutCount(item.id)}}
68
                                      </span>
68
                                      </span>
69
                                    </td>
69
                                    </td>
70
                                    <td v-if="end_time!=''">
70
                                    <td v-if="end_time!=''">
71
-                                    {{getWareInfo(item.xt_warehouse_info) - getAutoCount(item.id) - getOutCount(item.id) + getCancelCount(item.id) }}
71
+                                    {{getWareInfo(item.xt_warehouse_info) - getAutoCount(item.id) - getOutCount(item.id)  }}
72
                                    </td>
72
                                    </td>
73
                                 </tr>
73
                                 </tr>
74
                             </tbody>
74
                             </tbody>